diff --git a/Changelog.md b/Changelog.md
index 12a0a9eff..83d042fc5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@
 * Fix size of images in the SPV [#4471](https://github.com/diaspora/diaspora/pull/4471)
 * Adjust 404 message description to not leak logged out users if a post exists or not [#4477](https://github.com/diaspora/diaspora/pull/4477)
 * Make I18n system more robust against missing keys in pluralization data
+* Prevent overflow of too long strings in the single post view [#4487](https://github.com/diaspora/diaspora/pull/4487)
 
 ## Features
 * Add oEmbed content to the mobile view [#4343](https://github.com/diaspora/diaspora/pull/4353)
diff --git a/app/assets/stylesheets/single-post-view.css.scss b/app/assets/stylesheets/single-post-view.css.scss
index 6baaa1f52..e9bac048f 100644
--- a/app/assets/stylesheets/single-post-view.css.scss
+++ b/app/assets/stylesheets/single-post-view.css.scss
@@ -63,6 +63,7 @@
     width: auto;
     p {
       margin: 0 0 1em 0;
+      word-wrap: break-word;
     }
     .photo_attachments {
       padding-bottom: 10px;
@@ -109,6 +110,7 @@
     padding-bottom: 10px;
     p {
       margin: 0 0 1em 0;
+      word-wrap: break-word;
       &:last-child {
         margin-bottom: 0;
       }