diff --git a/plugins/Mapstraction/usermap.js b/plugins/Mapstraction/usermap.js
index 41bdb677b4..270b7efea0 100644
--- a/plugins/Mapstraction/usermap.js
+++ b/plugins/Mapstraction/usermap.js
@@ -33,7 +33,8 @@ $(document).ready(function() {
           mkr = new mxn.Marker(pt);
 
           mkr.setIcon(n['user']['profile_image_url']);
-          mkr.setInfoBubble(n['html']);
+          mkr.setInfoBubble('<a href="'+ n['user']['profile_url'] + '">' + n['user']['screen_name'] + '</a>' + ' ' + n['html'] +
+                            '<br/><a href="'+ n['url'] + '">'+ n['created_at'] + '</a>');
 
           mapstraction.addMarker(mkr);
      }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d5917953ff..e584fae43c 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -957,6 +957,7 @@ max-width:74%;
 #showstream .notice div.entry-content,
 #shownotice .notice div.entry-content {
 margin-left:0;
+max-width:82%;
 }
 
 .notice .notice-options a,