=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java	2015-06-08 10:05:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/message/MessageConversation.java	2015-06-08 17:43:26 +0000
@@ -293,7 +293,7 @@
             displayName += ", " + lastSenderName;
         }
         
-        return StringUtils.trimToNull( displayName );
+        return StringUtils.trimToNull( StringUtils.substring( displayName, 0, 28 ) );
     }
 
     public Set<User> getTopRecipients()

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2015-06-08 10:05:46 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/message.vm	2015-06-08 17:43:26 +0000
@@ -47,7 +47,7 @@
                     </td>
                     <td style="width:40px;padding-left:5px;" onclick="toggleFollowUp( '${conversation.id}' )" class="followup-icon">
                         <img id="followUp${conversation.id}" #if( $conversation.followUp ) src="../images/marked.png"#else src="../images/unmarked.png"#end></td>
-                    <td style="width:220px" onclick="read( '${conversation.uid}' )">
+                    <td style="width:225px" onclick="read( '${conversation.uid}' )">
                         #if( $conversation.senderDisplayName )$!encoder.htmlEncode( $conversation.senderDisplayName )#else $i18n.getString( "system_notification" )#end
                         #if( $conversation.messageCount > 1 ) <span class="normal">(${conversation.messageCount})</span>#end
                     </td>

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2013-10-28 13:34:24 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/readMessage.vm	2015-06-08 17:43:26 +0000
@@ -25,7 +25,7 @@
 
 <h3>
 	<img id="followUp${conversation.id}" style="padding-right:8px; cursor:pointer;" onclick="toggleFollowUp( '${conversation.id}' )"#if( $conversation.followUp ) src="../images/marked.png"#else src="../images/unmarked.png"#end>
-	$encoder.htmlEncode( $conversation.subject )
+	$!encoder.htmlEncode( $conversation.subject )
 </h3>
 <div class="recipientsDiv tipText">
     $i18n.getString( "to" )
@@ -44,7 +44,7 @@
 #else
 <span class="bold">$i18n.getString( "system_notification" )</span>
 #end
-<span class="grey">&nbsp;&nbsp;$format.formatDate( $message.lastUpdated )</span>
+<span class="grey">&nbsp;&nbsp;$!format.formatDate( $message.lastUpdated )</span>
 
 <div class="messageText">$!dhisTextUtils.htmlify( $encoder.htmlEncode( $message.text ) )</div>
 <div id="metaData${message.id}" class="messageMetaData">$!encoder.htmlEncode( $message.metaData )</div>