diff --git a/app/src/main/java/eu/faircode/email/DaoFolder.java b/app/src/main/java/eu/faircode/email/DaoFolder.java
index cbd826a44f..801789d775 100644
--- a/app/src/main/java/eu/faircode/email/DaoFolder.java
+++ b/app/src/main/java/eu/faircode/email/DaoFolder.java
@@ -86,5 +86,5 @@ public interface DaoFolder {
     void updateFolder(EntityFolder folder);
 
     @Query("DELETE FROM folder WHERE account= :account AND name = :name")
-    int deleteFolder(Long account, String name);
+    void deleteFolder(Long account, String name);
 }
diff --git a/app/src/main/java/eu/faircode/email/DaoMessage.java b/app/src/main/java/eu/faircode/email/DaoMessage.java
index 806ca0edb7..07401495c6 100644
--- a/app/src/main/java/eu/faircode/email/DaoMessage.java
+++ b/app/src/main/java/eu/faircode/email/DaoMessage.java
@@ -96,7 +96,7 @@ public interface DaoMessage {
     void deleteMessage(long folder, long uid);
 
     @Query("DELETE FROM message WHERE folder = :folder")
-    int deleteMessages(long folder);
+    void deleteMessages(long folder);
 
     @Query("DELETE FROM message WHERE folder = :folder AND received < :received AND NOT uid IS NULL")
     int deleteMessagesBefore(long folder, long received);
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 93157aff33..5ffa1540f9 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -957,7 +957,7 @@ public class ServiceSynchronize extends LifecycleService {
                 for (EntityAttachment attachment : helper.getAttachments()) {
                     Log.i(Helper.TAG, "attachment name=" + attachment.name + " type=" + attachment.type);
                     attachment.message = message.id;
-                    db.attachment().insertAttachment(attachment);
+                    attachment.id = db.attachment().insertAttachment(attachment);
                 }
 
             } else if (message.seen != seen) {