diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 96a5256970..cf78d1dd22 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -84,6 +84,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
         }
 
         private void bindTo(TupleFolderEx folder) {
+            ivEdit.setVisibility(EntityFolder.OUTBOX.equals(folder.type) ? View.INVISIBLE : View.VISIBLE);
+
             String name = Helper.localizeFolderName(context, folder.name);
             if (folder.unseen > 0)
                 tvName.setText(context.getString(R.string.title_folder_unseen, name, folder.unseen));
diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index b18e0b5fbb..f690479c98 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -77,8 +77,6 @@ public class FragmentFolder extends FragmentEx {
                     @Override
                     protected Void onLoad(Context context, Bundle args) {
                         try {
-                            ServiceSynchronize.stop(getContext(), "folder");
-
                             long id = args.getLong("id");
                             boolean synchronize = args.getBoolean("synchronize");
                             String after = args.getString("after");