diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
index 679523c0b..6bb57b977 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -1,383 +1,389 @@
 <?php
 
 final class PHUIDiffInlineCommentDetailView
   extends PHUIDiffInlineCommentView {
 
   private $inlineComment;
   private $handles;
   private $markupEngine;
   private $editable;
   private $preview;
   private $allowReply;
   private $renderer;
   private $canMarkDone;
   private $objectOwnerPHID;
 
   public function setInlineComment(PhabricatorInlineCommentInterface $comment) {
     $this->inlineComment = $comment;
     return $this;
   }
 
   public function setHandles(array $handles) {
     assert_instances_of($handles, 'PhabricatorObjectHandle');
     $this->handles = $handles;
     return $this;
   }
 
   public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
     $this->markupEngine = $engine;
     return $this;
   }
 
   public function setEditable($editable) {
     $this->editable = $editable;
     return $this;
   }
 
   public function setPreview($preview) {
     $this->preview = $preview;
     return $this;
   }
 
   public function setAllowReply($allow_reply) {
     $this->allowReply = $allow_reply;
     return $this;
   }
 
   public function setRenderer($renderer) {
     $this->renderer = $renderer;
     return $this;
   }
 
   public function getRenderer() {
     return $this->renderer;
   }
 
   public function setCanMarkDone($can_mark_done) {
     $this->canMarkDone = $can_mark_done;
     return $this;
   }
 
   public function getCanMarkDone() {
     return $this->canMarkDone;
   }
 
   public function setObjectOwnerPHID($phid) {
     $this->objectOwnerPHID = $phid;
     return $this;
   }
 
   public function getObjectOwnerPHID() {
     return $this->objectOwnerPHID;
   }
 
   public function render() {
 
     require_celerity_resource('phui-inline-comment-view-css');
     $inline = $this->inlineComment;
 
     $classes = array(
       'differential-inline-comment',
     );
 
     $metadata = array(
       'id' => $inline->getID(),
       'phid' => $inline->getPHID(),
       'changesetID' => $inline->getChangesetID(),
       'number' => $inline->getLineNumber(),
       'length' => $inline->getLineLength(),
       'isNewFile' => (bool)$inline->getIsNewFile(),
       'on_right' => $this->getIsOnRight(),
       'original' => $inline->getContent(),
       'replyToCommentPHID' => $inline->getReplyToCommentPHID(),
     );
 
     $sigil = 'differential-inline-comment';
     if ($this->preview) {
       $sigil = $sigil.' differential-inline-comment-preview';
     }
 
     $classes = array(
       'differential-inline-comment',
     );
 
     $content = $inline->getContent();
     $handles = $this->handles;
 
     $links = array();
 
     $is_synthetic = false;
     if ($inline->getSyntheticAuthor()) {
       $is_synthetic = true;
     }
 
     $draft_text = null;
     if (!$is_synthetic) {
       // This display is controlled by CSS
       $draft_text = id(new PHUITagView())
         ->setType(PHUITagView::TYPE_SHADE)
         ->setName(pht('Unsubmitted'))
         ->setSlimShady(true)
         ->setShade(PHUITagView::COLOR_RED)
         ->addClass('mml inline-draft-text');
     }
 
     // I think this is unused
     if ($inline->getHasReplies()) {
       $classes[] = 'inline-comment-has-reply';
     }
     // I think this is unused
     if ($inline->getReplyToCommentPHID()) {
       $classes[] = 'inline-comment-is-reply';
     }
 
     $viewer_phid = $this->getUser()->getPHID();
     $owner_phid = $this->getObjectOwnerPHID();
 
     if ($viewer_phid) {
       if ($viewer_phid == $owner_phid) {
         $classes[] = 'viewer-is-object-owner';
       }
     }
 
     $action_buttons = new PHUIButtonBarView();
     $action_buttons->addClass('mml');
     $nextprev = null;
     if (!$this->preview) {
       $nextprev = new PHUIButtonBarView();
       $nextprev->addClass('mml');
       $up = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setTooltip(pht('Previous'))
         ->setIconFont('fa-chevron-up')
         ->addSigil('differential-inline-prev')
         ->setMustCapture(true);
 
       $down = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setTooltip(pht('Next'))
         ->setIconFont('fa-chevron-down')
         ->addSigil('differential-inline-next')
         ->setMustCapture(true);
 
       $nextprev->addButton($up);
       $nextprev->addButton($down);
 
       if ($this->allowReply) {
 
         if (!$is_synthetic) {
 
           // NOTE: No product reason why you can't reply to these, but the reply
           // mechanism currently sends the inline comment ID to the server, not
           // file/line information, and synthetic comments don't have an inline
           // comment ID.
 
           $reply_button = id(new PHUIButtonView())
             ->setTag('a')
             ->setColor(PHUIButtonView::SIMPLE)
             ->setIconFont('fa-reply')
             ->setTooltip(pht('Reply'))
             ->addSigil('differential-inline-reply')
             ->setMustCapture(true);
           $action_buttons->addButton($reply_button);
         }
 
       }
     }
 
     $anchor_name = 'inline-'.$inline->getID();
 
     if ($this->editable && !$this->preview) {
       $edit_button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setIconFont('fa-pencil')
         ->setTooltip(pht('Edit'))
         ->addSigil('differential-inline-edit')
         ->setMustCapture(true);
       $action_buttons->addButton($edit_button);
 
       $delete_button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setIconFont('fa-trash-o')
         ->setTooltip(pht('Delete'))
         ->addSigil('differential-inline-delete')
         ->setMustCapture(true);
       $action_buttons->addButton($delete_button);
 
     } else if ($this->preview) {
       $links[] = javelin_tag(
         'a',
         array(
           'class' => 'button simple',
           'meta'        => array(
             'anchor' => $anchor_name,
           ),
           'sigil'       => 'differential-inline-preview-jump',
         ),
         pht('Not Visible'));
 
       $delete_button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setTooltip(pht('Delete'))
         ->setIconFont('fa-trash-o')
         ->addSigil('differential-inline-delete')
         ->setMustCapture(true);
       $action_buttons->addButton($delete_button);
     }
 
     $done_button = null;
 
     if (!$is_synthetic) {
       $draft_state = false;
       switch ($inline->getFixedState()) {
         case PhabricatorInlineCommentInterface::STATE_DRAFT:
           $is_done = ($this->getCanMarkDone());
           $draft_state = true;
           break;
         case PhabricatorInlineCommentInterface::STATE_UNDRAFT:
           $is_done = !($this->getCanMarkDone());
           $draft_state = true;
           break;
         case PhabricatorInlineCommentInterface::STATE_DONE:
           $is_done = true;
           break;
         default:
         case PhabricatorInlineCommentInterface::STATE_UNDONE:
           $is_done = false;
           break;
       }
 
+      // If you don't have permission to mark the comment as "Done", you also
+      // can not see the draft state.
+      if (!$this->getCanMarkDone()) {
+        $draft_state = false;
+      }
+
       if ($is_done) {
         $classes[] = 'inline-is-done';
       }
 
       if ($draft_state) {
         $classes[] = 'inline-state-is-draft';
       }
 
       if ($this->getCanMarkDone()) {
         $done_input = javelin_tag(
           'input',
           array(
             'type' => 'checkbox',
             'checked' => ($is_done ? 'checked' : null),
             'disabled' => ($this->getCanMarkDone() ? null : 'disabled'),
             'class' => 'differential-inline-done',
             'sigil' => 'differential-inline-done',
           ));
         $done_button = phutil_tag(
           'label',
           array(
             'class' => 'differential-inline-done-label '.
                         ($this->getCanMarkDone() ? null : 'done-is-disabled'),
           ),
           array(
             $done_input,
             pht('Done'),
           ));
       } else {
         $done_button = id(new PHUIButtonView())
           ->setTag('a')
           ->setColor(PHUIButtonView::SIMPLE)
           ->addClass('mml');
         if ($is_done) {
           $done_button->setIconFont('fa-check');
           $done_button->setText(pht('Done'));
           $done_button->addClass('button-done');
         } else {
           $done_button->addClass('button-not-done');
           $done_button->setText(pht('Not Done'));
         }
       }
     }
 
     $content = $this->markupEngine->getOutput(
       $inline,
       PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
 
     if ($this->preview) {
       $anchor = null;
     } else {
       $anchor = phutil_tag(
         'a',
         array(
           'name'    => $anchor_name,
           'id'      => $anchor_name,
           'class'   => 'differential-inline-comment-anchor',
         ),
         '');
     }
 
     if ($inline->isDraft() && !$is_synthetic) {
       $classes[] = 'inline-state-is-draft';
     }
     if ($is_synthetic) {
       $classes[] = 'differential-inline-comment-synthetic';
     }
     $classes = implode(' ', $classes);
 
     $author_owner = null;
     if ($is_synthetic) {
       $author = $inline->getSyntheticAuthor();
     } else {
       $author = $handles[$inline->getAuthorPHID()]->getName();
       if ($inline->getAuthorPHID() == $this->objectOwnerPHID) {
         $author_owner = id(new PHUITagView())
           ->setType(PHUITagView::TYPE_SHADE)
           ->setName(pht('Author'))
           ->setSlimShady(true)
           ->setShade(PHUITagView::COLOR_YELLOW)
           ->addClass('mml');
       }
     }
 
     $group_left = phutil_tag(
       'div',
       array(
         'class' => 'inline-head-left',
       ),
       array(
         $author,
         $author_owner,
         $draft_text,
       ));
 
     $group_right = phutil_tag(
       'div',
       array(
         'class' => 'inline-head-right',
       ),
       array(
         $anchor,
         $links,
         $nextprev,
         $action_buttons,
         $done_button,
       ));
 
     $markup = javelin_tag(
       'div',
       array(
         'class' => $classes,
         'sigil' => $sigil,
         'meta'  => $metadata,
       ),
       array(
         phutil_tag_div('differential-inline-comment-head grouped', array(
           $group_left,
           $group_right,
         )),
         phutil_tag_div(
           'differential-inline-comment-content',
           phutil_tag_div('phabricator-remarkup', $content)),
       ));
 
     return $markup;
   }
 
 }