diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index c9c9bc3d30..d0940e9eb5 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -2576,6 +2576,11 @@
   display: none;
 }
 
+// To limit messages with things forcing them wider, like long attachment names
+.module-message {
+  max-width: 300px;
+}
+
 /* Spec: container > 438px and container < 593px*/
 @media (min-width: 800px) and (max-width: 925px) {
   .module-message {