diff --git a/reviewboard/static/rb/css/reviews.less b/reviewboard/static/rb/css/reviews.less
index b2ccc55929e67636ea045a90ecde5ee3ec6c3b3a..fca95fe63ae400e7f05900250f8b644509addb82 100644
--- a/reviewboard/static/rb/css/reviews.less
+++ b/reviewboard/static/rb/css/reviews.less
@@ -1447,6 +1447,7 @@
 
     line-height: inherit;
     text-rendering: inherit;
+    white-space: normal;
   }
 
   h1, h2, h3, h4, h5, h6 {
@@ -1454,37 +1455,35 @@
   }
 
   ul, ol {
-    padding: 0;
     line-height: 0;
+    margin: 0;
+    padding: 0;
+
+    ul, ol {
+      margin-left: 2ch;
+    }
+  }
+
+  ol {
     list-style-position: inside;
   }
 
   ul {
-    list-style: none;
-
-    li {
-      list-style: none;
+    list-style-position: outside;
+    list-style: disc;
+    margin-left: 2ch;
+  }
 
+  ol, ul, pre {
+    & + pre {
       /*
-       * The bullet point browsers use is too small and doesn't match the
-       * monospaced widths, so it will cause the text to shift. Replace it
-       * with our own.
+       * There are two blank lines between lists and code blocks, which won't
+       * otherwise be preserved. Try to keep that same spacing.
        */
-      &:before {
-        content: "• ";
-        font-weight: bold;
-      }
+      margin-top: @textarea-line-height;
     }
   }
 
-  ul+pre, ol+pre {
-    /*
-     * There are two blank lines between lists and code blocks, which won't
-     * otherwise be preserved. Try to keep that same spacing.
-     */
-    margin-top: @textarea-line-height;
-  }
-
   li {
     line-height: @textarea-line-height;
   }
@@ -1500,19 +1499,27 @@
     color: #4444cc;
   }
 
-  pre code {
-    border: none;
-    color: black;
-    display: block;
-    margin-left: 2.5em;
-    .box-sizing(border-box);
+  pre {
+    .pre-wrap;
 
-    .linenums {
-      /* On Firefox, we'll be one pixel too far to the right, so adjust it. */
-      -moz-margin-start: -1px;
+    * {
+      .pre-wrap;
+    }
 
-      li {
-        list-style: none;
+    code {
+      border: none;
+      color: black;
+      display: block;
+      margin-left: 2.5em;
+      .box-sizing(border-box);
+
+      .linenums {
+        /* On Firefox, we'll be one pixel too far to the right, so adjust it. */
+        -moz-margin-start: -1px;
+
+        li {
+          list-style: none;
+        }
       }
     }
   }