diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 2fd04f70c1..ab7f63b8c0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -399,6 +399,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         private TextView tvNoInternetBody;
         private ImageButton ibDownloading;
         private Group grpDownloading;
+        private ImageButton ibSeen;
 
         private TextView tvCalendarSummary;
         private TextView tvCalendarDescription;
@@ -588,6 +589,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             tvNoInternetBody = vsBody.findViewById(R.id.tvNoInternetBody);
             ibDownloading = vsBody.findViewById(R.id.ibDownloading);
             grpDownloading = vsBody.findViewById(R.id.grpDownloading);
+            ibSeen = vsBody.findViewById(R.id.ibSeen);
 
             rvImage = vsBody.findViewById(R.id.rvImage);
             rvImage.setHasFixedSize(false);
@@ -665,6 +667,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibMore.setOnClickListener(this);
 
                 ibDownloading.setOnClickListener(this);
+                ibSeen.setOnClickListener(this);
 
                 tvBody.setOnTouchListener(this);
                 tvBody.addOnLayoutChangeListener(this);
@@ -738,6 +741,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 ibMore.setOnClickListener(null);
 
                 ibDownloading.setOnClickListener(null);
+                ibSeen.setOnClickListener(null);
 
                 tvBody.setOnTouchListener(null);
                 tvBody.removeOnLayoutChangeListener(this);
@@ -1176,6 +1180,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
             pbBody.setVisibility(View.GONE);
             tvNoInternetBody.setVisibility(View.GONE);
             grpDownloading.setVisibility(View.GONE);
+            ibSeen.setVisibility(View.GONE);
         }
 
         private void clearCalendar() {
@@ -1596,7 +1601,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     return false;
 
                                 Uri uri = Uri.parse(url);
-                                return AdapterMessage.ViewHolder.this.onOpenLink(uri, null);
+                                return ViewHolder.this.onOpenLink(uri, null);
                             }
                         });
                 webView.setOnTouchListener(ViewHolder.this);
@@ -1616,6 +1621,16 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 wvBody.setVisibility(View.GONE);
             }
 
+            ibSeen.setImageResource(message.ui_seen
+                    ? R.drawable.baseline_visibility_off_24 : R.drawable.baseline_visibility_24);
+            ibSeen.setContentDescription(context.getString(message.ui_seen
+                    ? R.string.title_unseen : R.string.title_seen));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+                ibSeen.setTooltipText(context.getString(message.ui_seen
+                        ? R.string.title_unseen : R.string.title_seen));
+            ibSeen.setVisibility(message.folderReadOnly || message.uid == null
+                    ? View.GONE : View.VISIBLE);
+
             final Bundle args = new Bundle();
             args.putSerializable("message", message);
             args.putBoolean("show_full", show_full);
@@ -2350,6 +2365,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     case R.id.ibDownloading:
                         Helper.viewFAQ(context, 15);
                         break;
+                    case R.id.ibSeen:
+                        onMenuUnseen(message);
+                        break;
 
                     case R.id.btnCalendarAccept:
                     case R.id.btnCalendarDecline:
diff --git a/app/src/main/res/layout/include_message_body.xml b/app/src/main/res/layout/include_message_body.xml
index f00ed7352f..64a1e3dd90 100644
--- a/app/src/main/res/layout/include_message_body.xml
+++ b/app/src/main/res/layout/include_message_body.xml
@@ -101,6 +101,18 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/tvBody" />
 
+    <ImageButton
+        android:id="@+id/ibSeen"
+        android:layout_width="36dp"
+        android:layout_height="36dp"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:foregroundTint="?android:attr/textColorSecondary"
+        android:padding="6dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/wvBody"
+        app:srcCompat="@drawable/baseline_visibility_24" />
+
     <include
         android:id="@+id/InCalendar"
         layout="@layout/include_message_calendar"
@@ -108,7 +120,7 @@
         android:layout_height="wrap_content"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/wvBody" />
+        app:layout_constraintTop_toBottomOf="@id/ibSeen" />
 
     <include
         android:id="@+id/inAttachmentsAlt"