diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index f73e8198af..1743269adb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -34,7 +34,9 @@ import android.widget.TextView;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.LifecycleOwner;
@@ -50,6 +52,7 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
     private ViewType viewType;
 
     private boolean debug;
+    private Map<Long, Boolean> selected = new HashMap<>();
     private DateFormat df = SimpleDateFormat.getDateTimeInstance(SimpleDateFormat.SHORT, SimpleDateFormat.LONG);
 
     enum ViewType {FOLDER, THREAD}
@@ -100,6 +103,8 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
         private void bindTo(final TupleMessageEx message) {
             pbLoading.setVisibility(View.GONE);
 
+            itemView.setActivated(selected.containsKey(message.id) && selected.get(message.id));
+
             if (EntityFolder.DRAFTS.equals(message.folderType) ||
                     EntityFolder.OUTBOX.equals(message.folderType) ||
                     EntityFolder.SENT.equals(message.folderType)) {
@@ -186,10 +191,16 @@ public class AdapterMessage extends PagedListAdapter<TupleMessageEx, AdapterMess
                 return false;
 
             TupleMessageEx message = getItem(pos);
-            LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
-            lbm.sendBroadcast(
-                    new Intent(ActivityView.ACTION_VIEW_MESSAGE)
-                            .putExtra("id", message.id));
+
+            if (!selected.containsKey(message.id))
+                selected.put(message.id, false);
+            selected.put(message.id, !selected.get(message.id));
+            notifyItemChanged(pos);
+
+            //LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(context);
+            //lbm.sendBroadcast(
+            //        new Intent(ActivityView.ACTION_VIEW_MESSAGE)
+            //                .putExtra("id", message.id));
 
             return true;
         }
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index dd0277b9e7..e84241b2d0 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -23,11 +23,26 @@
         android:layout_height="0dp"
         android:scrollbarStyle="outsideOverlay"
         android:scrollbars="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+        android:id="@+id/bottom_navigation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:background="@color/colorPrimary"
+        android:visibility="gone"
+        app:itemIconTint="@color/bottomnav_background"
+        app:itemTextColor="@color/bottomnav_background"
+        app:labelVisibilityMode="labeled"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:menu="@menu/action_list_bottom" />
+
     <ProgressBar
         android:id="@+id/pbWait"
         style="@style/Base.Widget.AppCompat.ProgressBar"
@@ -54,6 +69,6 @@
         android:src="@drawable/baseline_edit_24"
         android:tint="@color/colorActionForeground"
         app:backgroundTint="?attr/colorAccent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toBottomOf="@+id/rvFolder"
         app:layout_constraintEnd_toEndOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/action_list_bottom.xml b/app/src/main/res/menu/action_list_bottom.xml
new file mode 100644
index 0000000000..eb756728c5
--- /dev/null
+++ b/app/src/main/res/menu/action_list_bottom.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_move"
+        android:icon="@drawable/baseline_folder_24"
+        android:title="@string/title_move"
+        app:showAsAction="ifRoom" />
+</menu>