diff --git a/Changelog.md b/Changelog.md
index fc284678b..fc711262e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -94,6 +94,7 @@ With the port to Bootstrap 3, app/views/terms/default.haml has a new structure.
 * Correctly skip setting sidekiq logfile on Heroku [#6500](https://github.com/diaspora/diaspora/pull/6500)
 * Fix notifications for interactions by non-contacts [#6498](https://github.com/diaspora/diaspora/pull/6498)
 * Fix issue where the publisher was broken on profile pages [#6503](https://github.com/diaspora/diaspora/pull/6503)
+* Limit flash message width on small devices [#6529](https://github.com/diaspora/diaspora/pull/6529)
 
 ## Features
 
diff --git a/app/assets/stylesheets/_flash_messages.scss b/app/assets/stylesheets/_flash_messages.scss
index 42ce1b4a1..e7354a6fd 100644
--- a/app/assets/stylesheets/_flash_messages.scss
+++ b/app/assets/stylesheets/_flash_messages.scss
@@ -19,4 +19,11 @@
     &.alert-succes { border: 1px solid darken($state-success-bg, 10%); }
     &.alert-warning { border: 1px solid darken($state-warning-bg, 10%); }
   }
+
+  @media (max-width: $grid-float-breakpoint-max) {
+    .flash-message {
+      max-width: 80%;
+      min-width: 80%;
+    }
+  }
 }