diff --git a/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDto.kt b/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDto.kt
index f8556ae64f2..3018387a95d 100644
--- a/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDto.kt
+++ b/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDto.kt
@@ -1,5 +1,6 @@
 package net.thunderbird.core.android.account
 
+import androidx.annotation.Discouraged
 import com.fsck.k9.mail.Address
 import com.fsck.k9.mail.ServerSettings
 import java.util.Calendar
@@ -21,7 +22,10 @@ const val DEFAULT_VISIBLE_LIMIT = 25
 /**
  * Account stores all of the settings for a single account defined by the user. Each account is defined by a UUID.
  */
-@Deprecated(message = "Use LegacyAccount instead, this class is only for compatibility with existing code.")
+@Discouraged(
+    message = "Use net.thunderbird.core.android.account.LegacyAccount instead, " +
+        "this class is only for compatibility with existing code.",
+)
 @Suppress("TooManyFunctions")
 open class LegacyAccountDto(
     override val uuid: String,
diff --git a/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDtoManager.kt b/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDtoManager.kt
index cb6187d82cc..06ec704b5f6 100644
--- a/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDtoManager.kt
+++ b/core/android/account/src/main/kotlin/net/thunderbird/core/android/account/LegacyAccountDtoManager.kt
@@ -1,14 +1,11 @@
 package net.thunderbird.core.android.account
 
+import androidx.annotation.Discouraged
 import kotlinx.coroutines.flow.Flow
 import net.thunderbird.feature.mail.account.api.AccountManager
 
-@Deprecated(
-    message = "Use net.thunderbird.core.android.account.LegacyAccountManager instead",
-    replaceWith = ReplaceWith(
-        expression = "LegacyAccountManager",
-        "net.thunderbird.core.android.account.LegacyAccountManager",
-    ),
+@Discouraged(
+    message = "Use net.thunderbird.core.android.account.LegacyAccountManager instead.",
 )
 interface LegacyAccountDtoManager : AccountManager<LegacyAccountDto> {
     override fun getAccounts(): List<LegacyAccountDto>