diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 92f3a1ba8f..39f2bb61a7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2612,6 +2612,7 @@ public class FragmentMessages extends FragmentBase {
                     getFragmentManager().popBackStack("thread", FragmentManager.POP_BACK_STACK_INCLUSIVE);
 
                 getArguments().putBoolean("fade", true);
+                getArguments().putBoolean("left", left);
 
                 Bundle nargs = new Bundle();
                 nargs.putLong("account", message.account);
@@ -2853,15 +2854,15 @@ public class FragmentMessages extends FragmentBase {
     @Override
     public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
         Bundle args = getArguments();
+        Boolean left = (Boolean) args.get("left");
         if (viewType == AdapterMessage.ViewType.THREAD && args != null) {
             if (enter) {
-                Boolean left = (Boolean) args.get("left");
                 if (left != null)
                     return AnimationUtils.loadAnimation(getContext(), left ? R.anim.enter_from_left : R.anim.enter_from_right);
             } else {
                 if (args.getBoolean("fade")) {
                     args.remove("fade");
-                    return AnimationUtils.loadAnimation(getContext(), android.R.anim.fade_out);
+                    return AnimationUtils.loadAnimation(getContext(), left ? R.anim.leave_to_right : R.anim.leave_to_left);
                 }
             }
         }
diff --git a/app/src/main/res/anim/leave_to_left.xml b/app/src/main/res/anim/leave_to_left.xml
new file mode 100644
index 0000000000..041db531e7
--- /dev/null
+++ b/app/src/main/res/anim/leave_to_left.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="-100%"
+        android:toYDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/leave_to_right.xml b/app/src/main/res/anim/leave_to_right.xml
new file mode 100644
index 0000000000..16335d0a49
--- /dev/null
+++ b/app/src/main/res/anim/leave_to_right.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0%"
+        android:fromYDelta="0%"
+        android:toXDelta="100%"
+        android:toYDelta="0%" />
+</set>
\ No newline at end of file