diff --git a/out/images/lock.png b/out/images/lock.png
new file mode 100644
index 000000000..99737ba83
Binary files /dev/null and b/out/images/lock.png differ
diff --git a/out/out.ViewFolder.php b/out/out.ViewFolder.php
index 3d04f4fab..fca97b8dc 100644
--- a/out/out.ViewFolder.php
+++ b/out/out.ViewFolder.php
@@ -126,7 +126,11 @@ foreach($documents as $document) {
 	
 	print "<td><a href=\"out.ViewDocument.php?documentid=".$docID."&showtree=".$showtree."\">" . $document->getName() . "</a></td>\n";
 	print "<td>".$owner->getFullName()."</td>";
-	print "<td>".getOverallStatusText($status["status"])."</td>";
+	print "<td>";
+  if ( $document->isLocked() ) {
+		print "<img src=\"".UI::getImgPath("lock.png")."\" title=\"". getMLText("locked_by").": ".$document->getLockingUser()->getFullName()."\"> ";
+	}
+	print getOverallStatusText($status["status"])."</td>";
 	print "<td>".$version."</td>";
 	print "<td>".$comment."</td>";
 	print "</tr>\n";