diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 9ac5eff7e6..18e0e67543 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -906,7 +906,9 @@ public class FragmentMessages extends FragmentEx {
             db.account().liveAccountDraft(account < 0 ? null : account).observe(getViewLifecycleOwner(), new Observer<EntityAccount>() {
                 @Override
                 public void onChanged(EntityAccount account) {
-                    if (account != null) {
+                    if (account == null)
+                        fab.hide();
+                    else {
                         fab.setTag(account.id);
                         fab.show();
                     }