diff --git a/settings/css/settings.css b/settings/css/settings.css
index 814eb665428..050914beef6 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -328,14 +328,12 @@ table.grid td.date{
 .cronlog {
 	margin-left: 10px;
 }
-
 .cronstatus {
 	display: inline-block;
 	height: 16px;
 	width: 16px;
 	vertical-align: text-bottom;
 }
-
 .cronstatus.success {
 	border-radius: 50%;
 }
@@ -349,6 +347,11 @@ table.grid td.date{
 	padding: 7px 10px
 }
 
+#log .log-message {
+	word-break: break-all;
+	min-width: 180px;
+}
+
 span.success {
         background: #37ce02;
         border-radius: 3px;
diff --git a/settings/js/log.js b/settings/js/log.js
index c3a9a201e83..43ef561f7ee 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -52,6 +52,7 @@ OC.Log = {
 			row.append(appTd);
 
 			var messageTd = $('<td/>');
+			messageTd.addClass('log-message');
 			messageTd.text(entry.message);
 			row.append(messageTd);
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 7813babf5c5..8c2b12fb2d9 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -408,7 +408,7 @@ if ($_['cronErrors']) {
 			<td>
 				<?php p($entry->app);?>
 			</td>
-			<td>
+			<td class="log-message">
 				<?php p($entry->message);?>
 			</td>
 			<td class="date">