diff --git a/app/src/main/java/eu/faircode/email/AdapterOperation.java b/app/src/main/java/eu/faircode/email/AdapterOperation.java
index e7eb4391f6..2bc122c4e4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterOperation.java
+++ b/app/src/main/java/eu/faircode/email/AdapterOperation.java
@@ -93,7 +93,10 @@ public class AdapterOperation extends RecyclerView.Adapter<AdapterOperation.View
                 sb.append(' ').append(ex.toString());
             }
 
-            tvFolder.setText(operation.accountName + "/" + operation.folderName);
+            String folderName =
+                    (operation.accountName == null ? "" : operation.accountName + "/") + operation.folderName;
+
+            tvFolder.setText(folderName);
             tvMessage.setText(operation.message == null ? null : Long.toString(operation.message));
             tvOperation.setText(sb.toString());
             tvTime.setText(DateUtils.getRelativeTimeSpanString(context, operation.created));
diff --git a/app/src/main/java/eu/faircode/email/DaoOperation.java b/app/src/main/java/eu/faircode/email/DaoOperation.java
index e2de2564b6..10e0c74e3e 100644
--- a/app/src/main/java/eu/faircode/email/DaoOperation.java
+++ b/app/src/main/java/eu/faircode/email/DaoOperation.java
@@ -34,7 +34,7 @@ public interface DaoOperation {
             " FROM operation" +
             " JOIN folder ON folder.id = operation.folder" +
             " LEFT JOIN message ON message.id = operation.message" +
-            " LEFT JOIN account ON account.id = message.account" +
+            " LEFT JOIN account ON account.id = message.account OR account.id = folder.account" +
             " LEFT JOIN identity ON identity.id = message.identity" +
             " ORDER BY" +
             "  CASE WHEN operation.name = '" + EntityOperation.SYNC + "' THEN" +