diff --git a/reviewboard/templates/reviews/comment_issue.html b/reviewboard/templates/reviews/comment_issue.html
index 7a6258dd8e030cc984e28d9d3207934872447d45..77ad30e8518210cff99c4a500445ff917ce32194 100644
--- a/reviewboard/templates/reviews/comment_issue.html
+++ b/reviewboard/templates/reviews/comment_issue.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load reviewtags %}
 {% load staticfiles %}
 
 <div class="issue-state">
@@ -14,7 +15,7 @@
 </div>
 <script language="javascript">
   $(document).ready(function() {
-    $("#comment-{{comment.id}}-issue")
+    $("#comment-{{comment.comment_type}}-{{comment.id}}-issue")
         .commentIssue({{review.id}}, {{comment.id}}, "{{comment_type}}", "{{issue_status}}",
                       {{interactive}});
   });
diff --git a/reviewboard/templates/reviews/review_detail.html b/reviewboard/templates/reviews/review_detail.html
index 3ee3d09de9ad13cf21d525bbb996a2831a5e46fd..6fcfc7dbb232306a9464488afd09bcea134fa022 100644
--- a/reviewboard/templates/reviews/review_detail.html
+++ b/reviewboard/templates/reviews/review_detail.html
@@ -111,7 +111,7 @@
     <dd>
      <pre class="comment-text" id="{{comment.anchor_prefix}}{{comment.id}}">{{comment.text|escape}}</pre>
 {% if comment.issue_opened %}
-     <div id="comment-{{comment.id}}-issue" class="issue-indicator">
+     <div id="comment-{{comment.comment_type}}-{{comment.id}}-issue" class="issue-indicator">
        {% comment_issue review_request_details comment "screenshot_comments" %}
      </div>
 {% endif %}
@@ -141,7 +141,7 @@
     <dd>
      <pre class="comment-text" id="{{comment.anchor_prefix}}{{comment.id}}">{{comment.text|escape}}</pre>
 {% if comment.issue_opened %}
-     <div id="comment-{{comment.id}}-issue" class="issue-indicator">
+     <div id="comment-{{comment.comment_type}}-{{comment.id}}-issue" class="issue-indicator">
        {% comment_issue review_request_details comment "file_attachment_comments" %}
      </div>
 {% endif %}
@@ -180,7 +180,7 @@
     <dd>
      <pre class="reviewtext comment-text" id="{{comment.anchor_prefix}}{{comment.id}}">{{comment.text|escape}}</pre>
 {% if comment.issue_opened %}
-     <div id="comment-{{comment.id}}-issue" class="issue-indicator">
+     <div id="comment-{{comment.comment_type}}-{{comment.id}}-issue" class="issue-indicator">
        {% comment_issue review_request_details comment "diff_comments" %}
      </div>
 {% endif %}
diff --git a/reviewboard/templates/reviews/review_draft_inline_form.html b/reviewboard/templates/reviews/review_draft_inline_form.html
index 3d03c2aeeff8530934f98d3c219be58d10752cfe..7ece008a4a57af32007859d0ecb4599cfeee4bc1 100644
--- a/reviewboard/templates/reviews/review_draft_inline_form.html
+++ b/reviewboard/templates/reviews/review_draft_inline_form.html
@@ -7,7 +7,7 @@
  <pre class="body-top editable">{{review.body_top}}</pre>
 
  <div class="comments">
-{% if review.comments.all or review.screenshot_comments.all %}
+{% if review.comments.all or review.screenshot_comments.all or review.file_attachment_comments.all %}
   <dl class="diff-comments">
 {% for comment in review.screenshot_comments.all %}
    <dt>
@@ -20,8 +20,9 @@
    </dt>
    <dd>
     <pre class="editable comment-editable" id="screenshot-comment-{{comment.id}}">{{comment.text|escape}}</pre>
-    <input type="checkbox" id="comment-issue-{{comment.id}}" {% if comment.issue_opened %}checked="checked"{% endif %}/>
-    <label for="comment-issue-{{comment.id}}">Open an issue</label>
+    <input type="checkbox" id="screenshot-comment-issue-{{comment.id}}" {% if comment.issue_opened %}checked="checked"{% endif %}/>
+    <label for="screenshot-comment-issue-{{comment.id}}">Open an issue</label>
+
 {% comment %}
     <!-- We'll want to do this eventually... Need to make it work in a
          non-instant-apply world. -->
@@ -38,7 +39,43 @@
         comment.ready(function() {});
         var editor = $("#screenshot-comment-{{comment.id}}")
             .reviewFormCommentEditor(comment);
-        $("#edit-screenshot-comment-{{comment.id").click(function() {
+        $("#edit-screenshot-comment-{{comment.id}}").click(function() {
+            editor.inlineEditor("startEdit");
+        });
+    </script>
+   </dd>
+{% endfor %}
+
+{% for comment in review.file_attachment_comments.all %}
+   <dt>
+    <div class="file-attachment">
+      <a href="{{comment.file_attachment.get_absolute_url}}">
+       <img src="{{comment.file_attachment.icon_url}}" />
+       <span class="filename">{{comment.file_attachment.filename}}</span>
+      </a>
+    </div>
+   </dt>
+   <dd>
+    <pre class="editable comment-editable" id="file-comment-{{comment.id}}">{{comment.text|escape}}</pre>
+    <input type="checkbox" id="file-comment-issue-{{comment.id}}" {% if comment.issue_opened %}checked="checked"{% endif %}/>
+    <label for="file-comment-issue-{{comment.id}}">Open an issue</label>
+
+{% comment %}
+    <!-- We'll want to do this eventually... Need to make it work in a
+         non-instant-apply world. -->
+
+    <ul class="controls">
+     <li><a href="#" id="delete-file-comment-{{comment.id}}">{% trans "Delete comment" %}</a></li>
+    </ul>
+{% endcomment %}
+
+    <script type="text/javascript">
+        var comment = gReviewRequest.createReview().createFileAttachmentComment(
+            {{comment.id}}, {{comment.file_attachment.id}});
+        comment.ready(function() {});
+        var editor = $("#file-comment-{{comment.id}}")
+            .reviewFormCommentEditor(comment);
+        $("#edit-file-comment-{{comment.id}}").click(function() {
             editor.inlineEditor("startEdit");
         });
     </script>
@@ -73,8 +110,8 @@
    </dt>
    <dd>
     <pre class="editable comment-editable" id="diff-comment-{{comment.id}}">{{comment.text|escape}}</pre>
-    <input type="checkbox" id="comment-issue-{{comment.id}}" {% if comment.issue_opened %}checked="checked"{% endif %}/>
-    <label for="comment-issue-{{comment.id}}">Open an issue</label>
+    <input type="checkbox" id="diff-comment-issue-{{comment.id}}" {% if comment.issue_opened %}checked="checked"{% endif %}/>
+    <label for="diff-comment-issue-{{comment.id}}">Open an issue</label>
 
 {% comment %}
     <!-- We'll want to do this eventually... Need to make it work in a