diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index 90a06c801..6c940f7cc 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -144,6 +144,10 @@
       border-top: 6px solid transparent;
       border-bottom: 6px solid transparent;
     }
+
+    .content a {
+      word-break: break-all
+    }
   }
 
   .incoming {
diff --git a/stylesheets/manifest.css b/stylesheets/manifest.css
index d72fe5f8e..10dc0d46a 100644
--- a/stylesheets/manifest.css
+++ b/stylesheets/manifest.css
@@ -456,6 +456,9 @@ input.search {
       top: 11px;
       border-top: 6px solid transparent;
       border-bottom: 6px solid transparent; }
+    .message-detail .bubble .content a,
+    .message-list .bubble .content a {
+      word-break: break-all; }
   .message-detail .incoming .bubble,
   .message-list .incoming .bubble {
     color: #454545;