diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandFetchMessage.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandFetchMessage.kt
index 059fcd4a5c..9feb47492d 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandFetchMessage.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/CommandFetchMessage.kt
@@ -13,7 +13,7 @@ internal class CommandFetchMessage(private val imapStore: ImapStore) {
             folder.open(OpenMode.READ_WRITE)
 
             val message = folder.getMessage(messageServerId)
-            folder.fetchPart(message, part, null, bodyFactory, -1)
+            folder.fetchPart(message, part, bodyFactory, -1)
         } finally {
             folder.close()
         }
diff --git a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
index 783765cfd8..2687964fba 100644
--- a/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
+++ b/backend/imap/src/main/java/com/fsck/k9/backend/imap/ImapSync.kt
@@ -200,7 +200,6 @@ internal class ImapSync(
                 remoteFolder,
                 backendFolder,
                 remoteMessages,
-                false,
                 highestKnownUid,
                 listener
             )
@@ -260,7 +259,6 @@ internal class ImapSync(
                 remoteFolder,
                 backendFolder,
                 listOf(remoteMessage),
-                false,
                 null,
                 SimpleSyncListener()
             )
@@ -278,15 +276,12 @@ internal class ImapSync(
      * The [BackendFolder] instance corresponding to the remote folder.
      * @param inputMessages
      * A list of messages objects that store the UIDs of which messages to download.
-     * @param flagSyncOnly
-     * Only flags will be fetched from the remote store if this is `true`.
      */
     private fun downloadMessages(
         syncConfig: SyncConfig,
         remoteFolder: ImapFolder,
         backendFolder: BackendFolder,
         inputMessages: List<ImapMessage>,
-        flagSyncOnly: Boolean,
         highestKnownUid: Long?,
         listener: SyncListener
     ) {
@@ -301,10 +296,8 @@ internal class ImapSync(
             evaluateMessageForDownload(
                 message,
                 backendFolder,
-                remoteFolder,
                 unsyncedMessages,
-                syncFlagMessages,
-                flagSyncOnly
+                syncFlagMessages
             )
         }
 
@@ -396,10 +389,8 @@ internal class ImapSync(
     private fun evaluateMessageForDownload(
         message: ImapMessage,
         backendFolder: BackendFolder,
-        remoteFolder: ImapFolder,
         unsyncedMessages: MutableList<ImapMessage>,
-        syncFlagMessages: MutableList<ImapMessage>,
-        flagSyncOnly: Boolean
+        syncFlagMessages: MutableList<ImapMessage>
     ) {
         val messageServerId = message.uid
         if (message.isSet(Flag.DELETED)) {
@@ -410,10 +401,8 @@ internal class ImapSync(
 
         val messagePresentLocally = backendFolder.isMessagePresent(messageServerId)
         if (!messagePresentLocally) {
-            if (!flagSyncOnly) {
-                Timber.v("Message with uid %s has not yet been downloaded", messageServerId)
-                unsyncedMessages.add(message)
-            }
+            Timber.v("Message with uid %s has not yet been downloaded", messageServerId)
+            unsyncedMessages.add(message)
             return
         }
 
@@ -668,7 +657,7 @@ internal class ImapSync(
          */
         val bodyFactory: BodyFactory = DefaultBodyFactory()
         for (part in viewables) {
-            remoteFolder.fetchPart(message, part, null, bodyFactory, maxDownloadSize)
+            remoteFolder.fetchPart(message, part, bodyFactory, maxDownloadSize)
         }
 
         // Store the updated message locally
diff --git a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
index fe78507fc3..8b97bfa61e 100644
--- a/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
+++ b/backend/imap/src/test/java/com/fsck/k9/backend/imap/TestImapFolder.kt
@@ -116,7 +116,6 @@ class TestImapFolder(override val serverId: String) : ImapFolder {
     override fun fetchPart(
         message: ImapMessage,
         part: Part,
-        listener: MessageRetrievalListener<ImapMessage>?,
         bodyFactory: BodyFactory,
         maxDownloadSize: Int
     ) {
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
index ffd4733185..5589d6de70 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/ImapFolder.kt
@@ -53,7 +53,6 @@ interface ImapFolder {
     fun fetchPart(
         message: ImapMessage,
         part: Part,
-        listener: MessageRetrievalListener<ImapMessage>?,
         bodyFactory: BodyFactory,
         maxDownloadSize: Int
     )
diff --git a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
index 64c1959e3a..81d85f9bfe 100644
--- a/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
+++ b/mail/protocols/imap/src/main/java/com/fsck/k9/mail/store/imap/RealImapFolder.kt
@@ -627,7 +627,6 @@ internal class RealImapFolder(
     override fun fetchPart(
         message: ImapMessage,
         part: Part,
-        listener: MessageRetrievalListener<ImapMessage>?,
         bodyFactory: BodyFactory,
         maxDownloadSize: Int
     ) {
@@ -683,8 +682,6 @@ internal class RealImapFolder(
                             }
                         }
                     }
-
-                    listener?.messageFinished(message)
                 } else {
                     handleUntaggedResponse(response)
                 }
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
index 927e66baf1..9e5866a50b 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/RealImapFolderTest.kt
@@ -794,7 +794,7 @@ class RealImapFolderTest {
         val part = createPart("TEXT")
         whenever(imapConnection.readResponse(anyOrNull())).thenReturn(createImapResponse("x OK"))
 
-        folder.fetchPart(message, part, null, mock(), 4096)
+        folder.fetchPart(message, part, mock(), 4096)
 
         verify(imapConnection).sendCommand("UID FETCH 1 (UID BODY.PEEK[TEXT]<0.4096>)", false)
     }
@@ -808,7 +808,7 @@ class RealImapFolderTest {
         val part = createPart("1.1")
         whenever(imapConnection.readResponse(anyOrNull())).thenReturn(createImapResponse("x OK"))
 
-        folder.fetchPart(message, part, null, mock(), MAX_DOWNLOAD_SIZE)
+        folder.fetchPart(message, part, mock(), MAX_DOWNLOAD_SIZE)
 
         verify(imapConnection).sendCommand("UID FETCH 1 (UID BODY.PEEK[1.1])", false)
     }
@@ -822,7 +822,7 @@ class RealImapFolderTest {
         val part = createPlainTextPart("1.1")
         setupSingleFetchResponseToCallback()
 
-        folder.fetchPart(message, part, null, DefaultBodyFactory(), MAX_DOWNLOAD_SIZE)
+        folder.fetchPart(message, part, DefaultBodyFactory(), MAX_DOWNLOAD_SIZE)
 
         val bodyArgumentCaptor = argumentCaptor<Body>()
         verify(part).body = bodyArgumentCaptor.capture()
diff --git a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
index 75da635116..67be422ed0 100644
--- a/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
+++ b/mail/protocols/imap/src/test/java/com/fsck/k9/mail/store/imap/TestImapFolder.kt
@@ -77,7 +77,6 @@ internal open class TestImapFolder(
     override fun fetchPart(
         message: ImapMessage,
         part: Part,
-        listener: MessageRetrievalListener<ImapMessage>?,
         bodyFactory: BodyFactory,
         maxDownloadSize: Int
     ) {