diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
index 565d2d6cb4..906454c1f3 100644
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -173,14 +173,15 @@ final class PholioMockViewController extends PholioController {
   }
 
   private function buildDescriptionView(PholioMock $mock) {
-
     $viewer = $this->getViewer();
+
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer);
     $description = $mock->getDescription();
 
     if (strlen($description)) {
-      $properties->addImageContent($description);
+      $properties->addTextContent(
+        new PHUIRemarkupView($viewer, $description));
       return id(new PHUIObjectBoxView())
         ->setHeaderText(pht('Mock Description'))
         ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index d50dfb3b3a..6c92f1d21f 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -92,6 +92,16 @@ final class PholioMockImagesView extends AphrontView {
         $current_set++;
       }
 
+      $description = $engine->getOutput($image, 'default');
+      if (strlen($description)) {
+        $description = phutil_tag(
+          'div',
+          array(
+            'class' => 'phabricator-remarkup',
+          ),
+          $description);
+      }
+
       $history_uri = '/pholio/image/history/'.$image->getID().'/';
       $images[] = array(
         'id' => $image->getID(),
@@ -105,7 +115,7 @@ final class PholioMockImagesView extends AphrontView {
         'width' => $x,
         'height' => $y,
         'title' => $image->getName(),
-        'descriptionMarkup' => $engine->getOutput($image, 'default'),
+        'descriptionMarkup' => $description,
         'isObsolete' => (bool)$image->getIsObsolete(),
         'isImage' => $file->isViewableImage(),
         'isViewable' => $file->isViewableInBrowser(),