diff --git a/css/activity.css b/css/activity.css
index 843406f4c..a612ba125 100644
--- a/css/activity.css
+++ b/css/activity.css
@@ -8,6 +8,11 @@
 	text-decoration: none;
 }
 
+.activitymessage .visualdiff {
+	overflow: scroll;
+	max-height: 200px;
+}
+
 .activityTabView .avatardiv-container {
 	display: inline-block;
 	bottom: -3px;
diff --git a/lib/Activity/DeckProvider.php b/lib/Activity/DeckProvider.php
index 844f1cb2d..887211ed8 100644
--- a/lib/Activity/DeckProvider.php
+++ b/lib/Activity/DeckProvider.php
@@ -276,7 +276,8 @@ class DeckProvider implements IProvider {
 	private function parseParamForChanges($subjectParams, $params, $event) {
 		if (array_key_exists('diff', $subjectParams) && $subjectParams['diff']) {
 			$diff = new Diff();
-			$event->setMessage($subjectParams['after']);
+			// Don't add diff as message since we are limited to 255 chars here
+			//$event->setMessage($subjectParams['after']);
 			$event->setParsedMessage('<pre class="visualdiff">' . $diff->render($subjectParams['before'], $subjectParams['after']) . '</pre>');
 			return $params;
 		}