diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index e6d9664033..ef03dc85fc 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/build.gradle b/app/build.gradle
index d919b740ba..4083349308 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "eu.faircode.email"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 128
-        versionName "1.128"
+        versionCode 129
+        versionName "1.129"
         archivesBaseName = "FairEmail-v$versionName"
 
         javaCompileOptions {
diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index d92d9b8340..b0f62ecd0f 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -261,8 +261,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             tvTime.setText(null);
             ivAttachments.setVisibility(View.GONE);
             tvSubject.setText(null);
-            if (tvPreview != null)
-                tvPreview.setText(null);
+            tvPreview.setVisibility(View.GONE);
             tvFolder.setText(null);
             tvCount.setText(null);
             ivThread.setVisibility(View.GONE);
@@ -334,9 +333,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
             ivAttachments.setVisibility(message.attachments > 0 ? View.VISIBLE : View.GONE);
             tvSubject.setText(message.subject);
 
-            tvPreview.setText(null);
-            tvPreview.setVisibility(preview && message.content ? View.VISIBLE : View.GONE);
-            if (message.content) {
+            tvPreview.setVisibility(View.GONE);
+            if (preview && message.content) {
                 Bundle args = new Bundle();
                 args.putSerializable("message", message);
 
@@ -356,6 +354,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                     @Override
                     protected void onLoaded(Bundle args, String preview) {
                         tvPreview.setText(preview);
+                        tvPreview.setVisibility(View.VISIBLE);
                         tvPreview.setHasTransientState(false);
                     }