diff --git a/Changelog.md b/Changelog.md
index a138049d2..4b4407a66 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -98,6 +98,7 @@ This is disabled by default since it requires the installation of additional pac
 * Improve handling of the `more` link on mobile stream pages [#5400](https://github.com/diaspora/diaspora/pull/5400)
 * Fix prefilling publisher after getting started [#5442](https://github.com/diaspora/diaspora/pull/5442)
 * Fix overflow in profile sidebar [#5450](https://github.com/diaspora/diaspora/pull/5450)
+* Fix code overflow in SPV and improve styling for code tags [#5422](https://github.com/diaspora/diaspora/pull/5422)
 
 ## Features
 * Don't pull jQuery from a CDN by default [#5105](https://github.com/diaspora/diaspora/pull/5105)
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index 06752bfc8..1f07d23fd 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -74,3 +74,6 @@
 /* contacts */
 @import 'contacts';
 @import 'leftnavbar';
+
+/* code */
+@import 'new_styles/code';
diff --git a/app/assets/stylesheets/new_styles/_code.scss b/app/assets/stylesheets/new_styles/_code.scss
new file mode 100644
index 000000000..181f5951a
--- /dev/null
+++ b/app/assets/stylesheets/new_styles/_code.scss
@@ -0,0 +1,10 @@
+code {
+  white-space: normal;
+  word-wrap: break-word;
+}
+
+pre {
+  overflow-x: auto;
+  white-space: pre;
+  code { white-space: pre; }
+}