diff --git a/Changelog.md b/Changelog.md
index f5a3aa1d6..582d47791 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -131,6 +131,7 @@ diaspora.yml file**. The existing settings from 0.4.x and before will not work a
 * Correctly decrease unread count for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
 * Fix automatic scroll for conversations [#5646](https://github.com/diaspora/diaspora/pull/5646)
 * Fix missing translation on privacy settings page [#5671](https://github.com/diaspora/diaspora/pull/5671)
+* Fix code overflow for the mobile website [#5675](https://github.com/diaspora/diaspora/pull/5675)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/stylesheets/mobile/mobile.css.scss b/app/assets/stylesheets/mobile/mobile.css.scss
index 64b32f333..dc973472d 100644
--- a/app/assets/stylesheets/mobile/mobile.css.scss
+++ b/app/assets/stylesheets/mobile/mobile.css.scss
@@ -12,6 +12,11 @@ a {
   text-decoration: none;
 }
 
+code {
+    white-space: normal;
+    word-wrap: break-word;
+  }
+
 body {
   background: {
     image: image-url('texture/hatched-light.jpg');