diff --git a/src/applications/paste/controller/PhabricatorPasteController.php b/src/applications/paste/controller/PhabricatorPasteController.php
index c9b93906a1..9e013da314 100644
--- a/src/applications/paste/controller/PhabricatorPasteController.php
+++ b/src/applications/paste/controller/PhabricatorPasteController.php
@@ -44,7 +44,7 @@ abstract class PhabricatorPasteController extends PhabricatorController {
     PhabricatorPaste $paste,
     $max_lines = null) {
 
-    $lines = explode("\n", rtrim($paste->getContent()));
+    $lines = phutil_split_lines($paste->getContent());
 
     return id(new PhabricatorSourceCodeView())
       ->setLimit($max_lines)
diff --git a/src/applications/paste/query/PhabricatorPasteQuery.php b/src/applications/paste/query/PhabricatorPasteQuery.php
index ccd242cc1c..fe877a7da6 100644
--- a/src/applications/paste/query/PhabricatorPasteQuery.php
+++ b/src/applications/paste/query/PhabricatorPasteQuery.php
@@ -141,7 +141,7 @@ final class PhabricatorPasteQuery
     foreach ($pastes as $paste) {
       $key = $this->getContentCacheKey($paste);
       if (isset($caches[$key])) {
-        $paste->attachContent($caches[$key]);
+        $paste->attachContent(phutil_safe_html($caches[$key]));
       } else {
         $need_raw[] = $paste;
       }