diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 7766844fc8..f2d02d2afe 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -814,6 +814,10 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
                             RecyclerView.Adapter.class.isAssignableFrom(type)) {
                         Log.i("Clearing " + f.getClass().getSimpleName() + ":" + field.getName());
                         field.setAccessible(true);
+
+                        if (Animator.class.isAssignableFrom(type))
+                            ((Animator) field.get(f)).setTarget(null);
+
                         field.set(f, null);
                     }
                 }
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 78cf8f70f9..446354eb69 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -661,7 +661,6 @@ public class Helper {
             public void onDestroyed() {
                 try {
                     animator.removeUpdateListener(listener);
-                    fab.setAlpha(1.0f);
                     owner.getLifecycle().removeObserver(this);
                 } catch (Throwable ex) {
                     Log.e(ex);