diff --git a/assets/css/app.css b/assets/css/app.css
index 1e8741f..cdfbf74 100644
--- a/assets/css/app.css
+++ b/assets/css/app.css
@@ -575,13 +575,11 @@ nav .active a {
 /* item preview full-content */
 .preview-full-content {
     overflow: auto;
-    margin-bottom: 10px;
     color: #666;
 }
 
-.preview-full-content p {
+.preview-full-content p, p.preview:not(:empty) {
     margin-top: 15px;
-    margin-bottom: 15px;
 }
 
 .preview-full-content img {
diff --git a/templates/item.php b/templates/item.php
index 483dc94..3d39a6c 100644
--- a/templates/item.php
+++ b/templates/item.php
@@ -22,15 +22,6 @@
             ><?= Helper\escape($item['title']) ?></a>
         <?php endif ?>
     </h2>
-    <?php if ($display_mode === 'full'): ?>
-        <div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
-            <?= $item['content'] ?>
-        </div>
-    <?php else: ?>
-        <p class="preview" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
-            <?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?>
-        </p>
-    <?php endif ?>
     <ul class="item-menu">
          <?php if ($menu !== 'feed-items'): ?>
         <li>
@@ -77,4 +68,11 @@
         <?= \Template\load('bookmark_links', array('item' => $item, 'menu' => $menu, 'offset' => $offset, 'source' => '')) ?>
         <?= \Template\load('status_links', array('item' => $item, 'redirect' => $menu, 'offset' => $offset)) ?>
     </ul>
+    <?php if ($display_mode === 'full'): ?>
+        <div class="preview-full-content" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>>
+            <?= $item['content'] ?>
+        </div>
+    <?php else: ?>
+        <p class="preview" <?= Helper\is_rtl($item) ? 'dir="rtl"' : 'dir="ltr"' ?>><?= Helper\escape(Helper\summary(strip_tags($item['content']), 50, 300)) ?></p>
+    <?php endif ?>
 </article>