diff --git a/lib/log.php b/lib/log.php
index bccc46846c..8bb2839be6 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -34,6 +34,6 @@ class OC_Log {
 			call_user_func(array(self::$class, 'init'));
 		}
 		$log_class=self::$class;
-		$log_class::write($app, htmlentities($message), $level);
+		$log_class::write($app, $message, $level);
 	}
 }
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 38c6042c82..d167f2780e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,7 +29,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
 				<?php echo $entry->app;?>
 			</td>
 			<td>
-				<?php echo $entry->message;?>
+				<?php echo htmlentities($entry->message);?>
 			</td>
 			<td>
 				<?php echo OC_Util::formatDate($entry->time);?>