diff --git a/src/sass/blocks/views/_mail-list.scss b/src/sass/blocks/views/_mail-list.scss
index 9acf014..b611918 100755
--- a/src/sass/blocks/views/_mail-list.scss
+++ b/src/sass/blocks/views/_mail-list.scss
@@ -265,6 +265,9 @@
             font-weight: bold;
             padding-right: 90px; // to make room for time
             padding-bottom: 8px;
+            & > span {
+                display: none;
+            }
         }
         &__time {
             @include scut-truncate;
@@ -406,12 +409,20 @@
             display: table-cell;
             border-bottom: 1px solid $color-border-light;
             padding: $cell-padding-vertical $cell-padding-horizontal;
+            width: 25%;
         }
         &__subject {
             @include scut-truncate;
             display: table-cell;
             border-bottom: 1px solid $color-border-light;
             padding: $cell-padding-vertical $cell-padding-horizontal;
+            & > strong {
+                font-weight: normal;
+            }
+            & > span {
+                margin-left: 0.5em;
+                color: $color-text-light;
+            }
         }
         &__time {
             display: table-cell;
@@ -439,6 +450,12 @@
             .mail-list-entry__name {
                 font-weight: bold;
             }
+            .mail-list-entry__subject {
+                font-weight: normal;
+                & > strong {
+                    font-weight: bold;
+                }
+            }
         }
         &--attachment {
             .mail-list-entry__attachment > svg {
diff --git a/src/tpl/mail-list.html b/src/tpl/mail-list.html
index a214b40..7894810 100644
--- a/src/tpl/mail-list.html
+++ b/src/tpl/mail-list.html
@@ -52,7 +52,12 @@
           </li>
         </ul>
         <h3 class="mail-list-entry__name">{{email.from[0].name || email.from[0].address}}</h3>
-        <div class="mail-list-entry__subject">{{email.subject || 'No subject'}}</div>
+        <div class="mail-list-entry__subject">
+          <strong>{{email.subject || 'No subject'}}</strong>
+          <span>
+            {{email.body ? email.body.substr(0, 200) : ''}}
+          </span>
+        </div>
         <div class="mail-list-entry__attachment">
           <svg><use xlink:href="#icon-attachment" /><title>Attachments</title></svg>
         </div>