diff --git a/app/src/main/java/eu/faircode/email/AdapterOrder.java b/app/src/main/java/eu/faircode/email/AdapterOrder.java
index b03e730260..3a2014cff0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOrder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOrder.java
@@ -167,6 +167,15 @@ public class AdapterOrder extends RecyclerView.Adapter<AdapterOrder.ViewHolder>
         notifyItemMoved(from, to);
     }
 
+    void onReset() {
+        List<EntityOrder> list = new ArrayList<>();
+        for (EntityOrder item : items) {
+            item.order = null;
+            list.add(item);
+        }
+        set(list);
+    }
+
     @Override
     @NonNull
     public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index 74ca71b29a..963b2613d9 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -132,9 +132,6 @@ public interface DaoAccount {
     @Query("UPDATE account SET last_connected = NULL")
     int clearAccountConnected();
 
-    @Query("UPDATE account SET `order` = NULL")
-    int resetAccountOrder();
-
     @Query("DELETE FROM account WHERE tbd = 1")
     int deleteAccountsTbd();
 }
diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index bcd445c782..2e9c626972 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -236,9 +236,6 @@ public interface DaoFolder {
     @Query("UPDATE folder SET read_only = :read_only WHERE id = :id")
     int setFolderReadOnly(long id, boolean read_only);
 
-    @Query("UPDATE folder SET `order` = NULL")
-    int resetFolderOrder();
-
     @Query("UPDATE folder SET tbc = null WHERE id = :id")
     int resetFolderTbc(long id);
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOrder.java b/app/src/main/java/eu/faircode/email/FragmentOrder.java
index 9e6dd70080..d36c6ff888 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOrder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOrder.java
@@ -93,8 +93,6 @@ public class FragmentOrder extends FragmentBase {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        DB db = DB.getInstance(getContext());
-
         if (EntityAccount.class.getName().equals(clazz))
             new SimpleTask<List<EntityAccount>>() {
                 @Override
@@ -216,36 +214,7 @@ public class FragmentOrder extends FragmentBase {
     }
 
     private void onMenuResetOrder() {
-        Bundle args = new Bundle();
-        args.putString("class", clazz);
-
-        new SimpleTask<Void>() {
-            @Override
-            protected Void onExecute(Context context, Bundle args) {
-                String clazz = args.getString("class");
-
-                DB db = DB.getInstance(context);
-
-                if (EntityAccount.class.getName().equals(clazz))
-                    db.account().resetAccountOrder();
-                else if (TupleFolderSort.class.getName().equals(clazz))
-                    db.folder().resetFolderOrder();
-                else
-                    throw new IllegalArgumentException("Unknown class=" + clazz);
-
-                return null;
-            }
-
-            @Override
-            protected void onExecuted(Bundle args, Void data) {
-                dirty = false;
-            }
-
-            @Override
-            protected void onException(Bundle args, Throwable ex) {
-                Helper.unexpectedError(getContext(), getViewLifecycleOwner(), ex);
-            }
-        }.execute(this, args, "order:reset");
+        adapter.onReset();
     }
 
     private ItemTouchHelper.Callback touchHelper = new ItemTouchHelper.Callback() {