diff --git a/static/styles/portico/markdown.scss b/static/styles/portico/markdown.scss
index 42e81744f1..79ef8ced8e 100644
--- a/static/styles/portico/markdown.scss
+++ b/static/styles/portico/markdown.scss
@@ -296,7 +296,7 @@
         font-size: 0.857em;
         unicode-bidi: embed;
         direction: ltr;
-        white-space: pre-wrap;
+        white-space: initial;
         padding: 0px;
         padding-right: 4px;
         background-color: hsl(0, 0%, 100%);
@@ -304,6 +304,9 @@
 
     pre {
         line-height: 15px;
+        code {
+            white-space: pre-wrap;
+        }
     }
 
     .code-section {
diff --git a/templates/zerver/api/changelog.md b/templates/zerver/api/changelog.md
index 8dc8b8d7c8..10d10958c4 100644
--- a/templates/zerver/api/changelog.md
+++ b/templates/zerver/api/changelog.md
@@ -17,8 +17,9 @@ below features are supported.
 
 **Feature level 17**
 
-* [`GET users/me/subscriptions`](/api/get-subscribed-streams), [`GET /streams`]
-  (api/get-all-streams): Added `message_retention_days` to the Stream objects.
+* [`GET users/me/subscriptions`](/api/get-subscribed-streams),
+  [`GET /streams`](api/get-all-streams): Added
+  `message_retention_days` to Stream objects.
 * [`POST users/me/subscriptions`](/api/add-subscriptions), [`PATCH
   streams/{stream_id}`](/api/update-stream): Added `message_retention_days`
   parameter.