diff --git a/lib/attachmentlistitem.php b/lib/attachmentlistitem.php
index 8adc07e6db..28ce9900b8 100644
--- a/lib/attachmentlistitem.php
+++ b/lib/attachmentlistitem.php
@@ -169,6 +169,8 @@ class AttachmentListItem extends Widget
                 default:
                     unset($thumb);  // there's no need carrying this along
                     switch ($this->attachment->mimetype) {
+                    case 'text/plain':
+                        $this->element('div', ['class'=>'e-content plaintext'], file_get_contents($this->attachment->getPath()));
                     case 'text/html':
                         if (!empty($this->attachment->filename)
                                 && (GNUsocial::isAjax() || common_config('attachments', 'show_html'))) {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index e6ac8b4d47..61696e6f11 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1503,6 +1503,13 @@ font-size:150%;
     font-style: normal;
 }
 
+div.e-content.plaintext {
+    border: dashed 1px gray;
+    font-family: monospace;
+    padding: 1em;
+    white-space: pre-line;
+}
+
 span.rtl {
     display: block;
     direction: rtl;