--- a/reviewboard/reviewboard/diffviewer/views.py
+++ b/reviewboard/reviewboard/diffviewer/views.py
@@ -62,17 +62,17 @@ class DiffViewerView(TemplateView):
 
         * ?file=<id>
           - Renders only the FileDiff represented by the provided ID.
 
         * ?page=<pagenum>
           - Renders diffs found on the given page number, if the diff viewer
             is paginated.
     """
-    template_name = 'diffviewer/view_diff.html'
+    template_name = 'diffviewer/view_diff_mozreview.html'
     fragment_error_template_name = 'diffviewer/diff_fragment_error.html'
 
     def get(self, request, diffset, interdiffset=None, *args, **kwargs):
         """Handles GET requests for this view.
 
         This will render the full diff viewer based on the provided
         parameters.
 

new file mode 100644
--- /dev/null
+++ b/reviewboard/reviewboard/templates/diffviewer/view_diff_mozreview.html
@@ -0,0 +1,107 @@
+{% extends "reviews/reviewable_base_mozreview.html" %}
+{% load difftags djblets_deco djblets_js djblets_utils i18n rb_extensions reviewtags %}
+{% load staticfiles tz %}
+
+{% block title %}{{review_request_details.summary}} | {% trans "Diff Viewer" %}{% endblock %}
+
+{% block css %}
+{{block.super}}
+
+{%  if siteconfig_settings.diffviewer_show_trailing_whitespace %}
+<style type="text/css">
+  #diffs.ewhl table.sidebyside .ew { background: #ee3434; }
+</style>
+{%  endif %}
+{% endblock css %}
+
+{% block content %}
+{%  if error %}
+{%   errorbox %}
+<h2>{% trans "There was an internal error displaying the diff." %}</h2>
+<p><b>{% blocktrans %}Details:</b> {{error}}{% endblocktrans %}</p>
+{%    if request.user.is_superuser %}
+{%     if trace %}<pre>{{trace|escape}}</pre>{% endif %}
+{%    endif %}
+{%   enderrorbox %}
+{%  else %}{# !error #}
+
+<div id="review_request">
+ <div id="review_request_banners"></div>
+{% display_review_request_trophies review_request %}
+
+{%   box "review-request" %}
+ <div class="review-request-header">
+  <ul class="actions page-tabs">
+   <li><a href="{{review_request.get_absolute_url}}">{% trans "Reviews" %}</a></li>
+   <li class="active"><a href="{% url 'view-diff' review_request.display_id %}#index_header">{% trans "Diff" %}</a></li>
+  </ul>
+
+  <div class="actions-container">
+   {% star review_request %}
+   <ul class="actions actions-right-container">
+    <li class="has-menu">
+     <a href="#" class="mobile-actions-menu-label"><span class="fa fa-ellipsis-h fa-lg"></span></a>
+     <ul class="actions actions-right">
+{%    include "reviews/review_request_actions_secondary.html" %}
+{%    diffviewer_action_hooks %}
+      <li id="download-diff" {% if interdiffset %}style="display: none;"{% endif %}><a href="raw/">{% trans "Download Diff" %}</a></li>
+{%    include "reviews/review_request_actions_primary.html" %}
+     </ul>
+    </li>
+   </ul>
+  </div>
+ </div>
+
+<div class="main">
+{%    include "reviews/review_request_box_mozreview.html" %}
+
+<div id="diff-details" class="content loading">
+ <a name="index_header"></a>
+ <div id="diff_revision_label"></div>
+  <div id="diff_revision_selector"></div>
+  <div id="diff_comments_hint"></div>
+  <div id="diff_index">
+   <span class="fa fa-spinner fa-pulse"></span>
+  </div>
+  <div id="pagination1"></div>
+ </div>
+</div>
+{%   endbox %}
+
+<ul id="view_controls">
+{%    if collapseall %}
+ <li><a href=".?expand=1"><span class="fa fa-plus"></span> {% trans "Expand changes" %}</a></li>
+{%    else %}
+ <li><a href=".?collapse=1"><span class="fa fa-minus"></span> {% trans "Collapse changes" %}</a></li>
+{%    endif %}
+{%    if siteconfig_settings.diffviewer_show_trailing_whitespace %}
+ <li class="ew" style="display:none;"><a href="#" class="toggle-show-whitespace"><span class="fa fa-minus"></span> {% trans "Hide extra whitespace" %}</a></li>
+ <li class="ew"><a href="#" class="toggle-show-whitespace"><span class="fa fa-plus"></span> {% trans "Show extra whitespace" %}</a></li>
+{%    endif %}
+ <li class="ws"><a href="#" class="toggle-whitespace-only-chunks"><span class="fa fa-minus"></span> {% trans "Hide whitespace changes" %}</a></li>
+ <li  class="ws" style="display:none;"><a href="#" class="toggle-whitespace-only-chunks"><span class="fa fa-plus"></span> {% trans "Show whitespace changes" %}</a></li>
+</ul>
+
+<div id="diffs"></div>
+<div id="pagination2"></div>
+
+{%  endif %}{# !error #}
+{% endblock content %}
+
+{% block scripts-post %}
+{{block.super}}
+
+{%  if not error %}
+<script>
+    RB.PageManager.setPage(new RB.DiffViewerPageView({
+        model: new RB.DiffViewerPageModel({{diff_context|json_dumps}},
+                                          {parse: true}),
+        checkUpdatesType: 'diff',
+{%  localtime off %}
+        lastActivityTimestamp: {{last_activity_time|json_dumps}},
+{%  endlocaltime %}
+{%  include "reviews/reviewable_page_data.js" %}
+    }));
+</script>
+{%  endif %}{# !error #}
+{% endblock scripts-post %}