diff --git a/src/Ui/media/all.css b/src/Ui/media/all.css
index d742c3b5..c1b25cdf 100644
--- a/src/Ui/media/all.css
+++ b/src/Ui/media/all.css
@@ -62,7 +62,7 @@ a { color: black }
 .notification .message-outer { display: table-row }
 .notification .buttons { display: table-cell; vertical-align: top; padding-top: 9px; }
 .notification.long .body { padding-top: 10px; padding-bottom: 10px }
-.notification .message { display: table-cell; vertical-align: middle; }
+.notification .message { display: table-cell; vertical-align: middle; max-width: 400px; white-space: normal; }
 
 .notification.visible { max-width: 350px }
 
diff --git a/src/Ui/media/all.js b/src/Ui/media/all.js
index 86c61b51..e41d2476 100644
--- a/src/Ui/media/all.js
+++ b/src/Ui/media/all.js
@@ -835,7 +835,7 @@ $.extend( $.easing,
           };
         })(this)), timeout);
       }
-      width = elem.outerWidth();
+      width = Math.min(elem.outerWidth(), 580);
       if (!timeout) {
         width += 20;
       }
@@ -901,6 +901,7 @@ $.extend( $.easing,
 
 }).call(this);
 
+
 /* ---- src/Ui/media/Wrapper.coffee ---- */
 
 
@@ -2091,4 +2092,4 @@ $.extend( $.easing,
     }
   });
 
-}).call(this);
+}).call(this);
\ No newline at end of file