diff --git a/out/out.AdminTools.php b/out/out.AdminTools.php
index 89cacd909..370185391 100644
--- a/out/out.AdminTools.php
+++ b/out/out.AdminTools.php
@@ -51,6 +51,7 @@ if($settings->_enableFullSearch) {
 <?php
 }
 ?>
+	<li><a href="../out/out.ObjectCheck.php"><?php echo getMLText("objectcheck")?></a></li>
 	<li><a href="../out/out.Settings.php"><?php echo getMLText("settings")?></a></li>
 	</ul>
 <?php
diff --git a/out/out.ObjectCheck.php b/out/out.ObjectCheck.php
new file mode 100644
index 000000000..412bd2e33
--- /dev/null
+++ b/out/out.ObjectCheck.php
@@ -0,0 +1,122 @@
+<?php
+//    MyDMS. Document Management System
+//    Copyright (C) 2002-2005  Markus Westphal
+//    Copyright (C) 2006-2008 Malcolm Cowe
+//    Copyright (C) 2010 Matteo Lucarelli
+//    Copyright (C) 2011 Matteo Lucarelli
+//
+//    This program is free software; you can redistribute it and/or modify
+//    it under the terms of the GNU General Public License as published by
+//    the Free Software Foundation; either version 2 of the License, or
+//    (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU General Public License for more details.
+//
+//    You should have received a copy of the GNU General Public License
+//    along with this program; if not, write to the Free Software
+//    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+include("../inc/inc.Version.php");
+include("../inc/inc.Settings.php");
+include("../inc/inc.DBInit.php");
+include("../inc/inc.Language.php");
+include("../inc/inc.ClassUI.php");
+include("../inc/inc.Authentication.php");
+
+function tree($folder, $repair, $path=':', $indent='') { /* {{{ */
+	global $dms, $repair;
+
+	/* Don't do folderlist check for root folder */
+	if($path != ':') {
+		$folderList = $folder->getFolderList();
+		/* Check the folder */
+		if($folderList != $path) {
+			print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\"><img src=\"../out/images/folder_closed.gif\" width=18 height=18 border=0></a></td>";
+			print "<td><a class=\"standardText\" href=\"../out/out.ViewFolder.php?folderid=".$folder->getID()."\">";
+			$tmppath = $folder->getPath();
+			for ($i = 1; $i  < count($tmppath); $i++) {
+				print "/".$tmppath[$i]->getName();
+			}
+			print $foldername;
+			print "</a></td>";
+			
+			$owner = $folder->getOwner();
+			print "<td>".$owner->getFullName()."</td>";
+			print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
+			if($repair) {
+				$folder->repair();
+			}
+			print "<td></td>\n";
+			print "</tr>\n";
+		}
+	}
+
+	$subfolders = $folder->getSubFolders();
+	foreach($subfolders as $subfolder) {
+		tree($subfolder, $indent.'  ', $path.$folder->getId().':');
+	}
+	$path .= $folder->getId().':';
+	$documents = $folder->getDocuments();
+	foreach($documents as $document) {
+		/* Check the document */
+		$folderList = $document->getFolderList();
+		if($folderList != $path) {
+			$lc = $document->getLatestContent();
+			print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\"><img class=\"mimeicon\" src=\"../out/images/icons/".UI::getMimeIcon($lc->getFileType())."\" title=\"".$lc->getMimeType()."\"></a></td>";
+			print "<td><a class=\"standardText\" href=\"../out/out.ViewDocument.php?documentid=".$document->getID()."\">/";
+			$folder = $document->getFolder();
+			$tmppath = $folder->getPath();
+			for ($i = 1; $i  < count($tmppath); $i++) {
+				print $tmppath[$i]->getName()."/";
+			}
+			print $docName;
+			print "</a></td>";
+			$owner = $document->getOwner();
+			print "<td>".$owner->getFullName()."</td>";
+			print "<td>Folderlist is '".$folderList."', should be '".$path."'</td>";
+			if($repair) {
+			}
+			print "<td></td>\n";
+			print "</tr>\n";
+		}
+	}
+} /* }}} */
+
+if (!$user->isAdmin()) {
+	UI::exitError(getMLText("admin_tools"),getMLText("access_denied"));
+}
+
+$v = new LetoDMS_Version;
+
+UI::htmlStartPage(getMLText("admin_tools"));
+UI::globalNavigation();
+UI::pageNavigation(getMLText("admin_tools"), "admin_tools");
+UI::contentHeading(getMLText("objectcheck"));
+UI::contentContainerStart();
+
+if(isset($_GET['repair']) && $_GET['repair'] == 1) {
+	$repair = 1;
+	echo "<p>".getMLText('repairing_objects')."</p>";
+} else {
+	$repair = 0;
+	echo '<a href="out.ObjectCheck.php?repair=1">'.getMLText('do_object_repair').'</a>';
+}
+
+$folder = $dms->getFolder($settings->_rootFolderID);
+print "<table class=\"folderView\">";
+print "<thead>\n<tr>\n";
+print "<th></th>\n";
+print "<th>".getMLText("name")."</th>\n";
+print "<th>".getMLText("owner")."</th>\n";
+print "<th>".getMLText("error")."</th>\n";
+print "<th></th>\n";
+print "</tr>\n</thead>\n<tbody>\n";
+tree($folder, $repair);
+print "</tbody></table>\n";
+
+UI::contentContainerEnd();
+UI::htmlEndPage();
+?>