diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 495c996f74..badd7c4947 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -629,15 +629,23 @@ public class FragmentMessages extends FragmentBase {
                 final SwipeListener swipeListener = new SwipeListener(getContext(), new SwipeListener.ISwipeListener() {
                     @Override
                     public boolean onSwipeRight() {
-                        if (previous != null)
+                        if (previous == null) {
+                            Animation shake = AnimationUtils.loadAnimation(getContext(), R.anim.bounce_right);
+                            view.startAnimation(shake);
+                        } else
                             navigate(previous, true);
+
                         return (previous != null);
                     }
 
                     @Override
                     public boolean onSwipeLeft() {
-                        if (next != null)
+                        if (next == null) {
+                            Animation shake = AnimationUtils.loadAnimation(getContext(), R.anim.bounce_left);
+                            view.startAnimation(shake);
+                        } else
                             navigate(next, false);
+
                         return (next != null);
                     }
                 });
diff --git a/app/src/main/res/anim/bounce_left.xml b/app/src/main/res/anim/bounce_left.xml
new file mode 100644
index 0000000000..f398fa4699
--- /dev/null
+++ b/app/src/main/res/anim/bounce_left.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="-10%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/bounce_right.xml b/app/src/main/res/anim/bounce_right.xml
new file mode 100644
index 0000000000..faafd858ab
--- /dev/null
+++ b/app/src/main/res/anim/bounce_right.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="10%"
+        android:toXDelta="0%" />
+</set>
\ No newline at end of file