diff --git a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
index 14c2bb5..0816501 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
+++ b/polygerrit-ui/app/elements/diff/gr-diff/gr-diff.html
@@ -87,8 +87,13 @@
       .content {
         background-color: #fff;
       }
+      .full-width {
+        width: 100%;
+      }
       .lineNum,
       .content {
+        /* Set font size based the user's diff preference. */
+        font-size: var(--font-size, 12px);
         vertical-align: top;
         white-space: pre;
       }
@@ -113,11 +118,7 @@
            allows them to shrink. */
         max-width: var(--content-width, 80ch);
         min-width: var(--content-width, 80ch);
-      }
-      .content,
-      .lineNum {
-        /* Set font size based the user's diff preference. */
-        font-size: var(--font-size, 12px);
+        width: var(--content-width, 80ch);
       }
       .content.add .intraline,
       .content.add.darkHighlight {
@@ -137,6 +138,10 @@
         background-color: #fef;
         color: #849;
       }
+      .contentText {
+        white-space: pre-wrap;
+        word-wrap: break-word;
+      }
       .contextControl gr-button {
         display: inline-block;
         font-family: var(--monospace-font-family);
@@ -171,10 +176,11 @@
               comments="[[_comments]]"
               diff="[[_diff]]"
               view-mode="[[viewMode]]"
+              line-wrapping="[[lineWrapping]]"
               is-image-diff="[[isImageDiff]]"
               base-image="[[_baseImage]]"
               revision-image="[[_revisionImage]]">
-            <table id="diffTable"></table>
+            <table id="diffTable" class$="[[_diffTableClass]]"></table>
           </gr-diff-builder>
         </gr-diff-highlight>
       </gr-diff-selection>