diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
index f379ef1..e5d56f7 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/PatchScreen.java
@@ -88,6 +88,7 @@
     public Unified(final Patch.Key id, final int patchIndex,
         final PatchTable patchTable) {
       super(id, patchIndex, patchTable);
+      scriptSettings.getPrettySettings().setSyntaxHighlighting(false);
     }
 
     @Override
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettyFormatter.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettyFormatter.java
index 6b726fb..27273a3 100644
--- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettyFormatter.java
+++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettyFormatter.java
@@ -114,7 +114,13 @@
     settings = how;
     lines = new ArrayList<String>();
 
-    String html = prettify(toHTML(srcText));
+    String html = toHTML(srcText);
+    if (settings.isSyntaxHighlighting()) {
+      html = prettify(html);
+    } else {
+      html = html.replaceAll("\n", "<br />");
+    }
+
     int pos = 0;
     int textChunkStart = 0;
 
diff --git a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettySettings.java b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettySettings.java
index 1608e0e..657021c 100644
--- a/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettySettings.java
+++ b/gerrit-prettify/src/main/java/com/google/gerrit/prettify/common/PrettySettings.java
@@ -21,12 +21,14 @@
   protected int lineLength;
   protected int tabSize;
   protected boolean showTabs;
+  protected boolean syntaxHighlighting;
 
   public PrettySettings() {
     showWhiteSpaceErrors = true;
     lineLength = 100;
     tabSize = 2;
     showTabs = true;
+    syntaxHighlighting = true;
   }
 
   public PrettySettings(PrettySettings pretty) {
@@ -35,6 +37,7 @@
     lineLength = pretty.lineLength;
     tabSize = pretty.tabSize;
     showTabs = pretty.showTabs;
+    syntaxHighlighting = pretty.syntaxHighlighting;
   }
 
   public String getFilename() {
@@ -81,4 +84,12 @@
     showTabs = show;
     return this;
   }
+
+  public boolean isSyntaxHighlighting() {
+    return syntaxHighlighting;
+  }
+
+  public void setSyntaxHighlighting(final boolean on) {
+    syntaxHighlighting = on;
+  }
 }