diff --git a/app-k9mail/build.gradle.kts b/app-k9mail/build.gradle.kts
index 4f326b99d9d..de12e361b24 100644
--- a/app-k9mail/build.gradle.kts
+++ b/app-k9mail/build.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
 
     implementation(projects.app.core)
     implementation(projects.app.ui.legacy)
-    implementation(projects.app.ui.messageListWidget)
 
+    implementation(projects.feature.widget.messageList)
     implementation(projects.feature.widget.unread)
 
     implementation(libs.androidx.work.runtime)
diff --git a/app-k9mail/src/main/AndroidManifest.xml b/app-k9mail/src/main/AndroidManifest.xml
index ac7e3d4017c..a17625c2e14 100644
--- a/app-k9mail/src/main/AndroidManifest.xml
+++ b/app-k9mail/src/main/AndroidManifest.xml
@@ -22,6 +22,22 @@
 
         </provider>
 
+        <!-- This component is disabled by default (if possible). It will be enabled programmatically if necessary. -->
+        <!-- IMPORTANT: The component name must be `com.fsck.k9.widget.list.MessageListWidgetProvider` and can't be changed. -->
+        <receiver
+            android:name="com.fsck.k9.widget.list.MessageListWidgetProvider"
+            android:icon="@drawable/message_list_widget_preview"
+            android:label="@string/mail_list_widget_text"
+            android:enabled="@bool/home_screen_widgets_enabled"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/message_list_widget_info" />
+        </receiver>
+
         <!-- This component is disabled by default (if possible). It will be enabled programmatically if necessary. -->
         <!-- IMPORTANT: The component name must be `com.fsck.k9.provider.UnreadWidgetProvider` and can't be changed. -->
         <receiver
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt b/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt
index 5009d91e304..9e288a14dad 100644
--- a/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt
+++ b/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt
@@ -5,9 +5,9 @@ import app.k9mail.core.common.oauth.OAuthConfigurationFactory
 import app.k9mail.core.common.provider.AppNameProvider
 import app.k9mail.dev.developmentModuleAdditions
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract.FeatureThemeProvider
-import app.k9mail.feature.widget.unread.UnreadWidgetClassProvider
 import app.k9mail.provider.K9AppNameProvider
 import app.k9mail.provider.K9FeatureThemeProvider
+import app.k9mail.widget.appWidgetModule
 import com.fsck.k9.AppConfig
 import com.fsck.k9.BuildConfig
 import com.fsck.k9.activity.LauncherShortcuts
@@ -19,15 +19,14 @@ import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val appModule = module {
+    includes(appWidgetModule)
+
     single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }
     single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }
     single<AppConfig> { appConfig }
     single<OAuthConfigurationFactory> { K9OAuthConfigurationFactory() }
     single<AppNameProvider> { K9AppNameProvider(androidContext()) }
     single<FeatureThemeProvider> { K9FeatureThemeProvider() }
-    single<UnreadWidgetClassProvider> {
-        UnreadWidgetClassProvider { UnreadWidgetProvider::class.java }
-    }
 
     developmentModuleAdditions()
 }
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt b/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt
new file mode 100644
index 00000000000..f4538a16137
--- /dev/null
+++ b/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt
@@ -0,0 +1,8 @@
+package app.k9mail.widget
+
+import app.k9mail.feature.widget.message.list.MessageListWidgetConfig
+import com.fsck.k9.widget.list.MessageListWidgetProvider
+
+class K9MessageListWidgetConfig : MessageListWidgetConfig {
+    override val providerClass = MessageListWidgetProvider::class.java
+}
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/widget/K9UnreadWidgetConfig.kt b/app-k9mail/src/main/kotlin/app/k9mail/widget/K9UnreadWidgetConfig.kt
new file mode 100644
index 00000000000..7b2ee878429
--- /dev/null
+++ b/app-k9mail/src/main/kotlin/app/k9mail/widget/K9UnreadWidgetConfig.kt
@@ -0,0 +1,8 @@
+package app.k9mail.widget
+
+import app.k9mail.feature.widget.unread.UnreadWidgetConfig
+import com.fsck.k9.provider.UnreadWidgetProvider
+
+class K9UnreadWidgetConfig : UnreadWidgetConfig {
+    override val providerClass = UnreadWidgetProvider::class.java
+}
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt b/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt
new file mode 100644
index 00000000000..2c9ad58f9c1
--- /dev/null
+++ b/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt
@@ -0,0 +1,10 @@
+package app.k9mail.widget
+
+import app.k9mail.feature.widget.message.list.MessageListWidgetConfig
+import app.k9mail.feature.widget.unread.UnreadWidgetConfig
+import org.koin.dsl.module
+
+val appWidgetModule = module {
+    single<MessageListWidgetConfig> { K9MessageListWidgetConfig() }
+    single<UnreadWidgetConfig> { K9UnreadWidgetConfig() }
+}
diff --git a/app-k9mail/src/main/kotlin/com/fsck/k9/widget/list/MessageListWidgetProvider.kt b/app-k9mail/src/main/kotlin/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
new file mode 100644
index 00000000000..65449f42078
--- /dev/null
+++ b/app-k9mail/src/main/kotlin/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
@@ -0,0 +1,11 @@
+package com.fsck.k9.widget.list
+
+import app.k9mail.feature.widget.message.list.BaseMessageListWidgetProvider
+
+/**
+ * IMPORTANT: The fully qualified name for this class must be
+ *            `com.fsck.k9.widget.list.MessageListWidgetProvider`.
+ *             Otherwise widgets created with older versions of the app using a different name
+ *             will stop working or disappear.
+ */
+class MessageListWidgetProvider : BaseMessageListWidgetProvider()
diff --git a/app-thunderbird/build.gradle.kts b/app-thunderbird/build.gradle.kts
index 4ed783e9e38..265866fab0d 100644
--- a/app-thunderbird/build.gradle.kts
+++ b/app-thunderbird/build.gradle.kts
@@ -17,8 +17,8 @@ dependencies {
 
     implementation(projects.app.core)
     implementation(projects.app.ui.legacy)
-    implementation(projects.app.ui.messageListWidget)
 
+    implementation(projects.feature.widget.messageList)
     implementation(projects.feature.widget.unread)
 
     implementation(libs.androidx.work.runtime)
diff --git a/app-thunderbird/src/main/AndroidManifest.xml b/app-thunderbird/src/main/AndroidManifest.xml
index 43aa8ca90e0..871f1a8d739 100644
--- a/app-thunderbird/src/main/AndroidManifest.xml
+++ b/app-thunderbird/src/main/AndroidManifest.xml
@@ -22,6 +22,22 @@
 
         </provider>
 
+        <!-- This component is disabled by default (if possible). It will be enabled programmatically if necessary. -->
+        <!-- IMPORTANT: The component name must be `net.thunderbird.android.widget.provider.MessageListWidgetProvider` and can't be changed. -->
+        <receiver
+            android:name="net.thunderbird.android.widget.provider.MessageListWidgetProvider"
+            android:icon="@drawable/message_list_widget_preview"
+            android:label="@string/mail_list_widget_text"
+            android:enabled="@bool/home_screen_widgets_enabled"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/message_list_widget_info" />
+        </receiver>
+
         <!-- This component is disabled by default (if possible). It will be enabled programmatically if necessary. -->
         <!-- IMPORTANT: The component name and can't be changed and always must be:
                         `net.thunderbird.android.widget.provider.UnreadWidgetProvider`
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt
index 8412acb9b77..3f408f15ecc 100644
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt
@@ -3,30 +3,29 @@ package net.thunderbird.android
 import app.k9mail.core.common.oauth.OAuthConfigurationFactory
 import app.k9mail.core.common.provider.AppNameProvider
 import app.k9mail.feature.launcher.FeatureLauncherExternalContract.FeatureThemeProvider
-import app.k9mail.feature.widget.unread.UnreadWidgetClassProvider
 import com.fsck.k9.AppConfig
 import com.fsck.k9.activity.LauncherShortcuts
 import com.fsck.k9.activity.MessageCompose
-import com.fsck.k9.widget.list.MessageListWidgetProvider
 import net.thunderbird.android.auth.ThunderbirdOAuthConfigurationFactory
 import net.thunderbird.android.dev.developmentModuleAdditions
 import net.thunderbird.android.provider.TbAppNameProvider
 import net.thunderbird.android.provider.TbFeatureThemeProvider
+import net.thunderbird.android.widget.appWidgetModule
+import net.thunderbird.android.widget.provider.MessageListWidgetProvider
 import net.thunderbird.android.widget.provider.UnreadWidgetProvider
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
 val appModule = module {
+    includes(appWidgetModule)
+
     single(named("ClientInfoAppName")) { BuildConfig.CLIENT_INFO_APP_NAME }
     single(named("ClientInfoAppVersion")) { BuildConfig.VERSION_NAME }
     single<AppConfig> { appConfig }
     single<OAuthConfigurationFactory> { ThunderbirdOAuthConfigurationFactory() }
     single<AppNameProvider> { TbAppNameProvider(androidContext()) }
     single<FeatureThemeProvider> { TbFeatureThemeProvider() }
-    single<UnreadWidgetClassProvider> {
-        UnreadWidgetClassProvider { UnreadWidgetProvider::class.java }
-    }
 
     developmentModuleAdditions()
 }
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/KoinModule.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/KoinModule.kt
new file mode 100644
index 00000000000..0bfd96f4412
--- /dev/null
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/KoinModule.kt
@@ -0,0 +1,10 @@
+package net.thunderbird.android.widget
+
+import app.k9mail.feature.widget.message.list.MessageListWidgetConfig
+import app.k9mail.feature.widget.unread.UnreadWidgetConfig
+import org.koin.dsl.module
+
+val appWidgetModule = module {
+    single<MessageListWidgetConfig> { TbMessageListWidgetConfig() }
+    single<UnreadWidgetConfig> { TbUnreadWidgetConfig() }
+}
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbMessageListWidgetConfig.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbMessageListWidgetConfig.kt
new file mode 100644
index 00000000000..7fad862bb96
--- /dev/null
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbMessageListWidgetConfig.kt
@@ -0,0 +1,8 @@
+package net.thunderbird.android.widget
+
+import app.k9mail.feature.widget.message.list.MessageListWidgetConfig
+import net.thunderbird.android.widget.provider.MessageListWidgetProvider
+
+class TbMessageListWidgetConfig : MessageListWidgetConfig {
+    override val providerClass = MessageListWidgetProvider::class.java
+}
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbUnreadWidgetConfig.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbUnreadWidgetConfig.kt
new file mode 100644
index 00000000000..1edec6f8a23
--- /dev/null
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbUnreadWidgetConfig.kt
@@ -0,0 +1,8 @@
+package net.thunderbird.android.widget
+
+import app.k9mail.feature.widget.unread.UnreadWidgetConfig
+import net.thunderbird.android.widget.provider.UnreadWidgetProvider
+
+class TbUnreadWidgetConfig : UnreadWidgetConfig {
+    override val providerClass = UnreadWidgetProvider::class.java
+}
diff --git a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/provider/MessageListWidgetProvider.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/provider/MessageListWidgetProvider.kt
new file mode 100644
index 00000000000..dedf1d18f3f
--- /dev/null
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/provider/MessageListWidgetProvider.kt
@@ -0,0 +1,11 @@
+package net.thunderbird.android.widget.provider
+
+import app.k9mail.feature.widget.message.list.BaseMessageListWidgetProvider
+
+/**
+ * IMPORTANT: The fully qualified name for this class must be
+ *            `net.thunderbird.android.widget.provider.MessageListWidgetProvider`.
+ *            Otherwise widgets created with older versions of the app using a different name
+ *            will stop working or disappear.
+ */
+class MessageListWidgetProvider : BaseMessageListWidgetProvider()
diff --git a/app/common/build.gradle.kts b/app/common/build.gradle.kts
index e10d62ca8b7..e581e086ee6 100644
--- a/app/common/build.gradle.kts
+++ b/app/common/build.gradle.kts
@@ -4,7 +4,6 @@ plugins {
 
 dependencies {
     implementation(projects.app.ui.legacy)
-    implementation(projects.app.ui.messageListWidget)
     implementation(projects.app.core)
     implementation(projects.app.storage)
     implementation(projects.app.cryptoOpenpgp)
@@ -17,7 +16,9 @@ dependencies {
     implementation(projects.feature.account.setup)
     implementation(projects.feature.account.edit)
     implementation(projects.feature.settings.import)
+
     implementation(projects.feature.widget.unread)
+    implementation(projects.feature.widget.messageList)
 
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.core.ktx)
diff --git a/app/common/src/main/AndroidManifest.xml b/app/common/src/main/AndroidManifest.xml
index e1f00c4ccaf..88409ca2e78 100644
--- a/app/common/src/main/AndroidManifest.xml
+++ b/app/common/src/main/AndroidManifest.xml
@@ -230,21 +230,6 @@
             </intent-filter>
         </activity>
 
-        <!-- This component is disabled by default (if possible). It will be enabled programmatically if necessary. -->
-        <receiver
-            android:name="com.fsck.k9.widget.list.MessageListWidgetProvider"
-            android:icon="@drawable/message_list_widget_preview"
-            android:label="@string/mail_list_widget_text"
-            android:enabled="@bool/home_screen_widgets_enabled"
-            android:exported="false">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/message_list_widget_info" />
-        </receiver>
-
         <!-- This component is disabled by default. It will be enabled programmatically if necessary. -->
         <receiver
             android:name="com.fsck.k9.controller.push.BootCompleteReceiver"
diff --git a/app/common/src/main/java/com/fsck/k9/CommonApp.kt b/app/common/src/main/java/com/fsck/k9/CommonApp.kt
index 0436242c8e1..bca17376e4f 100644
--- a/app/common/src/main/java/com/fsck/k9/CommonApp.kt
+++ b/app/common/src/main/java/com/fsck/k9/CommonApp.kt
@@ -3,7 +3,7 @@ package com.fsck.k9
 import android.app.Application
 import android.content.res.Configuration
 import android.content.res.Resources
-import app.k9mail.ui.widget.list.MessageListWidgetManager
+import app.k9mail.feature.widget.message.list.MessageListWidgetManager
 import com.fsck.k9.controller.MessagingController
 import com.fsck.k9.job.WorkManagerConfigurationProvider
 import com.fsck.k9.notification.NotificationChannelManager
diff --git a/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt b/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
index f98ce258088..e95f1c7b877 100644
--- a/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
+++ b/app/common/src/main/java/com/fsck/k9/CommonKoinModule.kt
@@ -3,9 +3,9 @@ package com.fsck.k9
 import app.k9mail.core.featureflag.FeatureFlagFactory
 import app.k9mail.core.featureflag.FeatureFlagProvider
 import app.k9mail.core.featureflag.InMemoryFeatureFlagProvider
+import app.k9mail.feature.widget.message.list.messageListWidgetModule
 import app.k9mail.feature.widget.unread.UnreadWidgetUpdateListener
 import app.k9mail.feature.widget.unread.unreadWidgetModule
-import app.k9mail.ui.widget.list.messageListWidgetModule
 import com.fsck.k9.account.newAccountModule
 import com.fsck.k9.backends.backendsModule
 import com.fsck.k9.controller.ControllerExtension
@@ -18,7 +18,6 @@ import com.fsck.k9.preferences.K9StoragePersister
 import com.fsck.k9.preferences.StoragePersister
 import com.fsck.k9.resources.resourcesModule
 import com.fsck.k9.storage.storageModule
-import com.fsck.k9.widget.list.messageListWidgetConfigModule
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
 
@@ -43,7 +42,6 @@ val commonAppModule = module {
 
 val commonAppModules = listOf(
     commonAppModule,
-    messageListWidgetConfigModule,
     messageListWidgetModule,
     unreadWidgetModule,
     notificationModule,
diff --git a/app/common/src/main/java/com/fsck/k9/widget/list/KoinModule.kt b/app/common/src/main/java/com/fsck/k9/widget/list/KoinModule.kt
deleted file mode 100644
index c7cebde8fe4..00000000000
--- a/app/common/src/main/java/com/fsck/k9/widget/list/KoinModule.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.fsck.k9.widget.list
-
-import app.k9mail.ui.widget.list.MessageListWidgetConfig
-import org.koin.dsl.module
-
-val messageListWidgetConfigModule = module {
-    single<MessageListWidgetConfig> { K9MessageListWidgetConfig() }
-}
diff --git a/app/common/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt b/app/common/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
deleted file mode 100644
index 805be2eb139..00000000000
--- a/app/common/src/main/java/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.fsck.k9.widget.list
-
-import app.k9mail.ui.widget.list.MessageListWidgetConfig
-
-class MessageListWidgetProvider : app.k9mail.ui.widget.list.MessageListWidgetProvider()
-
-internal class K9MessageListWidgetConfig : MessageListWidgetConfig {
-    override val providerClass = MessageListWidgetProvider::class.java
-}
diff --git a/app/ui/legacy/src/main/res/values-ar/strings.xml b/app/ui/legacy/src/main/res/values-ar/strings.xml
index 565729138f9..b1cc7185a9a 100644
--- a/app/ui/legacy/src/main/res/values-ar/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ar/strings.xml
@@ -815,9 +815,7 @@
     <string name="crypto_no_provider_button">اذهب للاعدادات </string>
     <string name="mail_list_widget_text">قائمة رسائل K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">يُحمل…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">يُحمل…</string>
     <string name="openpgp_enabled_error_title">التعمية غير ممكنة</string>
     <string name="openpgp_enabled_error_msg">بعض المستلمين المحددين لا يدعمون هذه الميزة! </string>
     <string name="enable_encryption">تنشيط التعمية</string>
diff --git a/app/ui/legacy/src/main/res/values-be/strings.xml b/app/ui/legacy/src/main/res/values-be/strings.xml
index e33e36474fa..c59ca8c2a3e 100644
--- a/app/ui/legacy/src/main/res/values-be/strings.xml
+++ b/app/ui/legacy/src/main/res/values-be/strings.xml
@@ -834,9 +834,7 @@
     <string name="crypto_no_provider_button">Перайсці ў налады</string>
     <string name="mail_list_widget_text">Лісты K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Загрузка…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Загрузка…</string>
     <string name="openpgp_enabled_error_title">Зашыфраваць немагчыма</string>
     <string name="openpgp_enabled_error_msg">Некаторыя з гэтых адрасатаў не падтрымліваюць такую функцыю!</string>
     <string name="enable_encryption">Уключыць шыфраванне</string>
diff --git a/app/ui/legacy/src/main/res/values-bg/strings.xml b/app/ui/legacy/src/main/res/values-bg/strings.xml
index a020ec7dac0..e833cc16481 100644
--- a/app/ui/legacy/src/main/res/values-bg/strings.xml
+++ b/app/ui/legacy/src/main/res/values-bg/strings.xml
@@ -760,9 +760,7 @@
     <string name="crypto_no_provider_button">Към настройки</string>
     <string name="mail_list_widget_text">K-9 списък със собщения</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Зареждане…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Зареждане…</string>
     <string name="openpgp_enabled_error_title">Криптирането е невъзможно</string>
     <string name="openpgp_enabled_error_msg">Някои от избраните получатели не поддържат тази функция!</string>
     <string name="enable_encryption">Включване на криптирането</string>
diff --git a/app/ui/legacy/src/main/res/values-br/strings.xml b/app/ui/legacy/src/main/res/values-br/strings.xml
index 2acb4f1aa20..606e0372f66 100644
--- a/app/ui/legacy/src/main/res/values-br/strings.xml
+++ b/app/ui/legacy/src/main/res/values-br/strings.xml
@@ -737,9 +737,7 @@
     <string name="crypto_no_provider_button">Mont d\'an arventennoù</string>
     <string name="mail_list_widget_text">Roll kemennadennoù K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">O kargañ…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">O kargañ…</string>
     <string name="openpgp_enabled_error_title">N’eo ket posupl enrinegañ</string>
     <string name="openpgp_enabled_error_msg">Ul lodenn eus an degemererien ne skoront ket ar c’heweriuster-mañ!</string>
     <string name="enable_encryption">Gweredekaat an enrinegañ</string>
diff --git a/app/ui/legacy/src/main/res/values-ca/strings.xml b/app/ui/legacy/src/main/res/values-ca/strings.xml
index de7f1f0d748..de60b429024 100644
--- a/app/ui/legacy/src/main/res/values-ca/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ca/strings.xml
@@ -831,9 +831,7 @@
     <string name="crypto_no_provider_button">Ves a la configuració</string>
     <string name="mail_list_widget_text">Llista de missatges del K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">S\'està carregant…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">S\'està carregant…</string>
     <string name="openpgp_enabled_error_title">Encriptació no possible</string>
     <string name="openpgp_enabled_error_msg">Alguns dels destinataris seleccionats no admeten aquesta característica!</string>
     <string name="enable_encryption">Habilita l\'encriptació</string>
diff --git a/app/ui/legacy/src/main/res/values-co/strings.xml b/app/ui/legacy/src/main/res/values-co/strings.xml
index e69cd52238f..c0f82313b6b 100644
--- a/app/ui/legacy/src/main/res/values-co/strings.xml
+++ b/app/ui/legacy/src/main/res/values-co/strings.xml
@@ -756,7 +756,6 @@
     <string name="locked_attach_unencrypted">Sta parte ùn hè stata micca cifrata è puderia ùn esse sicura.</string>
     <string name="messageview_decrypt_cancelled">A dicifratura hè stata abbandunata.</string>
     <string name="account_settings_crypto_hide_sign_only_off">Tutte e segnature seranu affissate</string>
-    <string name="message_list_widget_initializing">Caricamentu…</string>
     <string name="openpgp_description_text1">A cifratura di i messaghji assicureghja ch’elli pudenu esse letti solu da u destinatariu, è da altrunimu.</string>
     <string name="openpgp_enabled_error_disable">Disattivà a cifratura</string>
     <string name="openpgp_encryption">Cifratura OpenPGP</string>
@@ -807,7 +806,6 @@
     <string name="messageview_decrypt_retry">Pruvà torna</string>
     <string name="messageview_decrypt_incomplete">U messaghju cifratu deve esse scaricatu per pudè esse dicifratu.</string>
     <string name="error_sign_only_no_encryption">A cifratura hè indispunibule in u modu « sign-only » !</string>
-    <string name="message_list_widget_list_item_loading">Caricamentu…</string>
     <string name="account_settings_crypto_prefer_encrypt">Modu mutuale di cifratura autumatica</string>
     <string name="dialog_autocrypt_mutual_description_2">S’è u speditore è i destinatarii attivanu u modu mutuale, a cifratura serà attivata in modu predefinitu.</string>
     <string name="dialog_openkeychain_info_title">Alcuna appiecazione OpenPGP ùn hè installata</string>
diff --git a/app/ui/legacy/src/main/res/values-cs/strings.xml b/app/ui/legacy/src/main/res/values-cs/strings.xml
index fd9f42e2691..a44011afe41 100644
--- a/app/ui/legacy/src/main/res/values-cs/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cs/strings.xml
@@ -835,9 +835,7 @@
     <string name="crypto_no_provider_button">Přejít do nastavení</string>
     <string name="mail_list_widget_text">Seznam zpráv K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Načítání…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Načítání…</string>
     <string name="openpgp_enabled_error_title">Šifrování není možné</string>
     <string name="openpgp_enabled_error_msg">Někteří ze zvolených příjemců nepodporují tuto funkci!</string>
     <string name="enable_encryption">Zapnout šifrování</string>
diff --git a/app/ui/legacy/src/main/res/values-cy/strings.xml b/app/ui/legacy/src/main/res/values-cy/strings.xml
index 4f7288639be..4c002ae4923 100644
--- a/app/ui/legacy/src/main/res/values-cy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-cy/strings.xml
@@ -819,9 +819,7 @@
     <string name="crypto_no_provider_button">Mynd i Osodiadau</string>
     <string name="mail_list_widget_text">Rhestr Negeseuon K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Yn llwytho…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Yn llwytho…</string>
     <string name="openpgp_enabled_error_title">Dyw amgryptiad ddim ar gael.</string>
     <string name="openpgp_enabled_error_msg">Dyw rhai o\'r derbynnwyr ddim yn cefnogi\'r nodwedd hon.</string>
     <string name="enable_encryption">Galluogi amgryptio</string>
diff --git a/app/ui/legacy/src/main/res/values-da/strings.xml b/app/ui/legacy/src/main/res/values-da/strings.xml
index f5bf70fda6e..7a3db99e643 100644
--- a/app/ui/legacy/src/main/res/values-da/strings.xml
+++ b/app/ui/legacy/src/main/res/values-da/strings.xml
@@ -817,9 +817,7 @@
     <string name="crypto_no_provider_button">Gå til opsætning</string>
     <string name="mail_list_widget_text">K-9 Meddelelsesliste</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Indlæser…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Indlæser…</string>
     <string name="openpgp_enabled_error_title">Kryptering var ikke mulig</string>
     <string name="openpgp_enabled_error_msg">Nogle af de valgte modtagere understøtter ikke denne funktion!</string>
     <string name="enable_encryption">Aktivér kryptering</string>
diff --git a/app/ui/legacy/src/main/res/values-de/strings.xml b/app/ui/legacy/src/main/res/values-de/strings.xml
index 41f1571b5f8..a079eacd50f 100644
--- a/app/ui/legacy/src/main/res/values-de/strings.xml
+++ b/app/ui/legacy/src/main/res/values-de/strings.xml
@@ -822,9 +822,7 @@
     <string name="crypto_no_provider_button">Zu den Einstellungen</string>
     <string name="mail_list_widget_text">K-9 Nachrichtenliste</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Ladevorgang…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Ladevorgang…</string>
     <string name="openpgp_enabled_error_title">Verschlüsselung nicht möglich</string>
     <string name="openpgp_enabled_error_msg">Einige der ausgewählten Empfänger unterstützen diese Funktion nicht!</string>
     <string name="enable_encryption">Verschlüsselung aktivieren</string>
diff --git a/app/ui/legacy/src/main/res/values-el/strings.xml b/app/ui/legacy/src/main/res/values-el/strings.xml
index 71f70526523..0d80a911bc0 100644
--- a/app/ui/legacy/src/main/res/values-el/strings.xml
+++ b/app/ui/legacy/src/main/res/values-el/strings.xml
@@ -822,9 +822,7 @@
     <string name="crypto_no_provider_button">Μετάβαση στις Ρυθμίσεις</string>
     <string name="mail_list_widget_text">Λίστα Μηνυμάτων του K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Φόρτωση…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Φόρτωση…</string>
     <string name="openpgp_enabled_error_title">Δεν είναι δυνατή η κρυπτογράφηση</string>
     <string name="openpgp_enabled_error_msg">Ορισμένοι από τους επιλεγμένους παραλήπτες δεν υποστηρίζουν αυτήν τη δυνατότητα!</string>
     <string name="enable_encryption">Ενεργοποίηση Κρυπτογράφησης</string>
diff --git a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
index a5a056bdc86..96057978d3f 100644
--- a/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
+++ b/app/ui/legacy/src/main/res/values-en-rGB/strings.xml
@@ -741,7 +741,6 @@
     <string name="crypto_msg_title_encrypted_signed_e2e">End-to-End encrypted</string>
     <string name="message_list_content_description_unread_prefix">unread, %s</string>
     <string name="general_settings_title">General settings</string>
-    <string name="message_list_widget_initializing">Loading…</string>
     <string name="generic_loading_error">An error occurred while loading the data</string>
     <string name="error_sign_only_no_encryption">Encryption unavailable in sign-only mode!</string>
     <string name="webview_contextmenu_link_text_clipboard_label">Link text</string>
@@ -878,7 +877,6 @@
     <string name="upgrade_databases_title">Upgrading databases</string>
     <string name="swipe_action_mark_as_read">Mark read</string>
     <string name="push_notification_state_wait_background_sync">Sleeping until background sync is allowed</string>
-    <string name="message_list_widget_list_item_loading">Loading…</string>
     <string name="openpgp_sign_only_keep_enabled">Keep Enabled</string>
     <string name="webview_contextmenu_image_view_action">View image</string>
     <string name="action_add_to_contacts">Add to contacts</string>
diff --git a/app/ui/legacy/src/main/res/values-eo/strings.xml b/app/ui/legacy/src/main/res/values-eo/strings.xml
index 58d1a1af7a9..c43c25aa5e3 100644
--- a/app/ui/legacy/src/main/res/values-eo/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eo/strings.xml
@@ -776,9 +776,7 @@
     <string name="crypto_no_provider_button">Iri al agordoj</string>
     <string name="mail_list_widget_text">K-9 mesaĝlisto</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Ŝargado…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Ŝargado…</string>
     <string name="openpgp_enabled_error_title">Ĉifrado ne eblas</string>
     <string name="openpgp_enabled_error_msg">Kelkaj da elektitaj ricevontoj ne subtenas tiun ĉi agordon!</string>
     <string name="enable_encryption">Aktivigi ĉifradon</string>
diff --git a/app/ui/legacy/src/main/res/values-es/strings.xml b/app/ui/legacy/src/main/res/values-es/strings.xml
index cbc42039946..708e92bb47a 100644
--- a/app/ui/legacy/src/main/res/values-es/strings.xml
+++ b/app/ui/legacy/src/main/res/values-es/strings.xml
@@ -827,9 +827,7 @@
     <string name="crypto_no_provider_button">Ir a los ajustes</string>
     <string name="mail_list_widget_text">Lista de correos de K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Cargando…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Cargando…</string>
     <string name="openpgp_enabled_error_title">No es posible cifrar</string>
     <string name="openpgp_enabled_error_msg">Alguno de los destinatarios no parece ser compatible con esta característica.</string>
     <string name="enable_encryption">Activar cifrado</string>
diff --git a/app/ui/legacy/src/main/res/values-et/strings.xml b/app/ui/legacy/src/main/res/values-et/strings.xml
index 55ad2183b85..81761560d8f 100644
--- a/app/ui/legacy/src/main/res/values-et/strings.xml
+++ b/app/ui/legacy/src/main/res/values-et/strings.xml
@@ -822,9 +822,7 @@
     <string name="crypto_no_provider_button">Ava sätted</string>
     <string name="mail_list_widget_text">K-9 kirjade loend</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Laadib…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Laadib…</string>
     <string name="openpgp_enabled_error_title">Krüpteerimine poe võimalik</string>
     <string name="openpgp_enabled_error_msg">Mõned kirja saajad ei saa seda funktsionaalsust kasutada!</string>
     <string name="enable_encryption">Võimalda krüpteerimine</string>
diff --git a/app/ui/legacy/src/main/res/values-eu/strings.xml b/app/ui/legacy/src/main/res/values-eu/strings.xml
index 27e2a85b79c..d7535560955 100644
--- a/app/ui/legacy/src/main/res/values-eu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-eu/strings.xml
@@ -821,9 +821,7 @@
     <string name="crypto_no_provider_button">Joan ezarpenetara</string>
     <string name="mail_list_widget_text">K-9-ren mezu-zerrenda</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Kargatzen…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Kargatzen…</string>
     <string name="openpgp_enabled_error_title">Zifratzea ez da posible</string>
     <string name="openpgp_enabled_error_msg">Hautatutako hartzaile batzuek ez dute eginbide hau onartzen!</string>
     <string name="enable_encryption">Gaitu zifratzea</string>
diff --git a/app/ui/legacy/src/main/res/values-fa/strings.xml b/app/ui/legacy/src/main/res/values-fa/strings.xml
index 6c409a43696..39e076da0fb 100644
--- a/app/ui/legacy/src/main/res/values-fa/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fa/strings.xml
@@ -821,9 +821,7 @@
     <string name="crypto_no_provider_button">برو به تنظیمات</string>
     <string name="mail_list_widget_text">لیست پیام K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">بارگیری…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">بارگیری…</string>
     <string name="openpgp_enabled_error_title">رمزنگاری ممکن نیست</string>
     <string name="openpgp_enabled_error_msg">بعضی از گیرندگان انتخابی از این ویژگی پشتیبانی نمی‌کنند!</string>
     <string name="enable_encryption">فعال‌سازی رمزنگاری</string>
diff --git a/app/ui/legacy/src/main/res/values-fi/strings.xml b/app/ui/legacy/src/main/res/values-fi/strings.xml
index 951700d6d95..51453a47972 100644
--- a/app/ui/legacy/src/main/res/values-fi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fi/strings.xml
@@ -821,9 +821,7 @@
     <string name="crypto_no_provider_button">Siirry asetuksiin</string>
     <string name="mail_list_widget_text">K-9-viestiluettelo</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Ladataan…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Ladataan…</string>
     <string name="openpgp_enabled_error_title">Salaus ei ole mahdollista</string>
     <string name="openpgp_enabled_error_msg">Jotkut valitut vastaanottajat eivät tue tätä ominaisuutta!</string>
     <string name="enable_encryption">Käytä salausta</string>
diff --git a/app/ui/legacy/src/main/res/values-fr/strings.xml b/app/ui/legacy/src/main/res/values-fr/strings.xml
index 6d1aae82b04..55ffdfd7479 100644
--- a/app/ui/legacy/src/main/res/values-fr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fr/strings.xml
@@ -828,9 +828,7 @@
     <string name="crypto_no_provider_button">Aller dans Paramètres</string>
     <string name="mail_list_widget_text">Liste des courriels de K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Chargement…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Chargement…</string>
     <string name="openpgp_enabled_error_title">Le chiffrement est impossible</string>
     <string name="openpgp_enabled_error_msg">Certains des destinataires sélectionnés ne prennent pas cette fonction en charge !</string>
     <string name="enable_encryption">Activer le chiffrement</string>
diff --git a/app/ui/legacy/src/main/res/values-fy/strings.xml b/app/ui/legacy/src/main/res/values-fy/strings.xml
index 2d55ad1cd9e..f812533bd2e 100644
--- a/app/ui/legacy/src/main/res/values-fy/strings.xml
+++ b/app/ui/legacy/src/main/res/values-fy/strings.xml
@@ -825,9 +825,7 @@
     <string name="crypto_no_provider_button">Gean nei Ynstellingen</string>
     <string name="mail_list_widget_text">K-9-berjochtelist</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Lade…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Lade…</string>
     <string name="openpgp_enabled_error_title">Fersifering net mooglik</string>
     <string name="openpgp_enabled_error_msg">Guon fan de ûntfangers stypje dizze funksje net!</string>
     <string name="enable_encryption">Fersifering ynskeakelje</string>
diff --git a/app/ui/legacy/src/main/res/values-gd/strings.xml b/app/ui/legacy/src/main/res/values-gd/strings.xml
index fe0796b32f3..79d75b84c9e 100644
--- a/app/ui/legacy/src/main/res/values-gd/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gd/strings.xml
@@ -747,9 +747,7 @@
     <string name="crypto_no_provider_button">Tagh aplacaid OpenPGP</string>
     <string name="mail_list_widget_text">Liosta theachdaireachdan puist</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">’Ga luchdadh…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">’Ga luchdadh…</string>
     <string name="openpgp_enabled_error_title">Cha ghabh a chrioptachadh</string>
     <string name="openpgp_enabled_error_msg">Cha chuir gach faightear a thagh thu taic ris a’ ghleus seo!</string>
     <string name="enable_encryption">Cuir crioptachadh an comas</string>
diff --git a/app/ui/legacy/src/main/res/values-gl/strings.xml b/app/ui/legacy/src/main/res/values-gl/strings.xml
index 964c4a6dc59..b7b3b9635db 100644
--- a/app/ui/legacy/src/main/res/values-gl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-gl/strings.xml
@@ -781,9 +781,7 @@
     <string name="crypto_no_provider_button">Ir a Configuración</string>
     <string name="mail_list_widget_text">Lista de mensaxes K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">A cargar…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">A cargar…</string>
     <string name="openpgp_enabled_error_title">Cifrado non posible</string>
     <string name="openpgp_enabled_error_msg">Algún dos destinatarios seleccionados non soportan esta característica!</string>
     <string name="enable_encryption">Habilitar cifrado</string>
diff --git a/app/ui/legacy/src/main/res/values-hr/strings.xml b/app/ui/legacy/src/main/res/values-hr/strings.xml
index 59d88410a50..c269b2189f0 100644
--- a/app/ui/legacy/src/main/res/values-hr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hr/strings.xml
@@ -741,9 +741,7 @@
     <string name="crypto_no_provider_button">Idi u Postavke</string>
     <string name="mail_list_widget_text">K-9 Popis Poruka</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Učitavam…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Učitavam…</string>
     <string name="openpgp_enabled_error_title">Šifriranje nije moguće</string>
     <string name="enable_encryption">Uključi šifriranje</string>
     <string name="disable_encryption">Onemogući šifriranje</string>
diff --git a/app/ui/legacy/src/main/res/values-hu/strings.xml b/app/ui/legacy/src/main/res/values-hu/strings.xml
index 8741865cbba..3d67a6ef973 100644
--- a/app/ui/legacy/src/main/res/values-hu/strings.xml
+++ b/app/ui/legacy/src/main/res/values-hu/strings.xml
@@ -821,9 +821,7 @@
     <string name="crypto_no_provider_button">Ugrás a beállításokhoz</string>
     <string name="mail_list_widget_text">K-9 üzenetlista</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Betöltés…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Betöltés…</string>
     <string name="openpgp_enabled_error_title">A titkosítás nem lehetséges</string>
     <string name="openpgp_enabled_error_msg">Néhány kiválasztott címzett nem támogatja ezt a funkciót!</string>
     <string name="enable_encryption">Titkosítás engedélyezése</string>
diff --git a/app/ui/legacy/src/main/res/values-in/strings.xml b/app/ui/legacy/src/main/res/values-in/strings.xml
index 353a31f39cd..e8fa083558f 100644
--- a/app/ui/legacy/src/main/res/values-in/strings.xml
+++ b/app/ui/legacy/src/main/res/values-in/strings.xml
@@ -757,9 +757,7 @@
     <string name="crypto_no_provider_button">Pergi ke Pengaturan</string>
     <string name="mail_list_widget_text">Daftar pesan K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Memuat…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Memuat…</string>
     <string name="openpgp_enabled_error_title">Enkripsi tidak mungkin dilakukan</string>
     <string name="openpgp_enabled_error_msg">Beberapa penerima yang dipilih tidak mendukung fitur ini!</string>
     <string name="enable_encryption">Aktifkan Enkripsi</string>
diff --git a/app/ui/legacy/src/main/res/values-is/strings.xml b/app/ui/legacy/src/main/res/values-is/strings.xml
index 954bd6a310e..24db5f3276f 100644
--- a/app/ui/legacy/src/main/res/values-is/strings.xml
+++ b/app/ui/legacy/src/main/res/values-is/strings.xml
@@ -822,9 +822,7 @@
     <string name="crypto_no_provider_button">Fara í stillingar</string>
     <string name="mail_list_widget_text">Skilaboðalisti K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Hleður…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Hleður…</string>
     <string name="openpgp_enabled_error_title">Dulritun er ekki möguleg</string>
     <string name="openpgp_enabled_error_msg">Sumir valinna viðtakenda styðja ekki við þennan eiginleika!</string>
     <string name="enable_encryption">Virkja dulritun</string>
diff --git a/app/ui/legacy/src/main/res/values-it/strings.xml b/app/ui/legacy/src/main/res/values-it/strings.xml
index ef6254fc527..95e9bf87cd1 100644
--- a/app/ui/legacy/src/main/res/values-it/strings.xml
+++ b/app/ui/legacy/src/main/res/values-it/strings.xml
@@ -831,9 +831,7 @@
     <string name="crypto_no_provider_button">Vai alle impostazioni</string>
     <string name="mail_list_widget_text">Lista messaggi di K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Caricamento…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Caricamento…</string>
     <string name="openpgp_enabled_error_title">Criptatura non possibile</string>
     <string name="openpgp_enabled_error_msg">Alcuni dei destinatari selezionati non supportano questa funzionalità!</string>
     <string name="enable_encryption">Abilita criptatura</string>
diff --git a/app/ui/legacy/src/main/res/values-iw/strings.xml b/app/ui/legacy/src/main/res/values-iw/strings.xml
index fdb19b8d55f..409cf611a4e 100644
--- a/app/ui/legacy/src/main/res/values-iw/strings.xml
+++ b/app/ui/legacy/src/main/res/values-iw/strings.xml
@@ -757,7 +757,6 @@
     <string name="crypto_no_provider_message">הדוא\"ל הזה הוצפן עם OpenPGP.
 \nעל מנת לקרוא אותו, עליך להתקין ולהגדיר יישומון OpenPGP תואם.</string>
     <string name="mail_list_widget_text">רשימת הודעות K-9</string>
-    <string name="message_list_widget_initializing">טוען…</string>
     <string name="openpgp_enabled_error_title">הצפנה לא אפשרית</string>
     <string name="openpgp_description_text3">הצפנה תופיע רק אם היא נתמכת ע\"י כל הנמענים, והם שלחו לך דוא\"ל בעבר.</string>
     <string name="account_settings_open_notification_settings_miscellaneous_summary">הגדרת התראות שגיאה ומצב</string>
@@ -867,7 +866,6 @@
     <string name="crypto_msg_encrypted_incomplete">חובה להוריד הודעה בשלמותה עבור פענוח</string>
     <string name="crypto_msg_encrypted_sign_unknown">ממפתח קצה לקצה לא מוכר</string>
     <string name="crypto_msg_encrypted_no_provider">אך לא מוגדר אף יישומון הצפנה (crypto app)</string>
-    <string name="message_list_widget_list_item_loading">טוען…</string>
     <string name="openpgp_enabled_error_back">אחורה</string>
     <string name="openpgp_enabled_error_disable">בטל הצפנה</string>
     <string name="account_settings_upload_sent_messages_summary">לאחר השליחה העלה הודעות לתיקיית פריטים שנשלחו</string>
diff --git a/app/ui/legacy/src/main/res/values-ja/strings.xml b/app/ui/legacy/src/main/res/values-ja/strings.xml
index b535d103828..4f2ddfaed59 100644
--- a/app/ui/legacy/src/main/res/values-ja/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ja/strings.xml
@@ -821,9 +821,7 @@
     <string name="crypto_no_provider_button">設定に移動</string>
     <string name="mail_list_widget_text">K-9 メッセージ一覧</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">読み込み中…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">読み込み中…</string>
     <string name="openpgp_enabled_error_title">暗号化できません</string>
     <string name="openpgp_enabled_error_msg">選択した受信者の一部が、この機能に対応していません！</string>
     <string name="enable_encryption">暗号化を有効にする</string>
diff --git a/app/ui/legacy/src/main/res/values-ka/strings.xml b/app/ui/legacy/src/main/res/values-ka/strings.xml
index 033657c6f86..18858851016 100644
--- a/app/ui/legacy/src/main/res/values-ka/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ka/strings.xml
@@ -493,9 +493,7 @@
     <string name="crypto_no_provider_button">პარამეტრებში შესვლა</string>
     <string name="mail_list_widget_text">K-9 მესიჯების ნუსხა</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">ჩატვირთვა…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">ჩატვირთვა…</string>
     <string name="openpgp_enabled_error_title">შიფრაცია შეუძლებელია</string>
     <string name="enable_encryption">შიფრაციის ჩართვა</string>
     <string name="disable_encryption">შიფრაციის გამორთვა</string>
diff --git a/app/ui/legacy/src/main/res/values-ko/strings.xml b/app/ui/legacy/src/main/res/values-ko/strings.xml
index f3acb9cb782..024f00d3415 100644
--- a/app/ui/legacy/src/main/res/values-ko/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ko/strings.xml
@@ -681,9 +681,7 @@
     <string name="unsigned_text_divider_label">서명되지 않은 글</string>
     <string name="crypto_no_provider_button">설정으로 움직이기</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">로딩 중…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">로딩 중…</string>
     <string name="openpgp_enabled_error_title">암호화가 불가능합니다</string>
     <string name="openpgp_enabled_error_msg">선택된 몇몇 받는 사람들은 이 기능을 지원하지 않습니다!</string>
     <string name="enable_encryption">암호화 사용</string>
diff --git a/app/ui/legacy/src/main/res/values-lt/strings.xml b/app/ui/legacy/src/main/res/values-lt/strings.xml
index 056f44c9691..8ca6500831b 100644
--- a/app/ui/legacy/src/main/res/values-lt/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lt/strings.xml
@@ -824,9 +824,7 @@
     <string name="crypto_no_provider_button">Eiti į Nustatymus</string>
     <string name="mail_list_widget_text">K-9 laiškų sąrašas</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Įkeliama…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Įkeliama…</string>
     <string name="openpgp_enabled_error_title">Šifravimas neįmanomas</string>
     <string name="openpgp_enabled_error_msg">Kai kurie iš pasirinktų gavėjų nepalaiko šios funkcijos!</string>
     <string name="enable_encryption">Įjungti šifravimą</string>
diff --git a/app/ui/legacy/src/main/res/values-lv/strings.xml b/app/ui/legacy/src/main/res/values-lv/strings.xml
index 8ba83a525f0..7ec8ce864d9 100644
--- a/app/ui/legacy/src/main/res/values-lv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-lv/strings.xml
@@ -831,9 +831,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
     <string name="crypto_no_provider_button">Doties uz Iestatījumiem</string>
     <string name="mail_list_widget_text">K-9 Ziņu saraksts</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Ielādē…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Ielādē…</string>
     <string name="openpgp_enabled_error_title">Šifrēšana nav iespējama</string>
     <string name="openpgp_enabled_error_msg">Daži no izvēlētajiem saņēmējiem šo iespēju neatbalsta!</string>
     <string name="enable_encryption">Iespējot šifrēšanu</string>
diff --git a/app/ui/legacy/src/main/res/values-ml/strings.xml b/app/ui/legacy/src/main/res/values-ml/strings.xml
index 0a09b88445d..023c87066a5 100644
--- a/app/ui/legacy/src/main/res/values-ml/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ml/strings.xml
@@ -781,9 +781,7 @@
     <string name="crypto_no_provider_button">ക്രമീകരണങ്ങളിലേക്ക് പോകുക</string>
     <string name="mail_list_widget_text">കെ-9 സന്ദേശ പട്ടിക</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">ലോഡുചെയ്യുന്നു…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">ലോഡുചെയ്യുന്നു…</string>
     <string name="openpgp_enabled_error_title">എൻക്രിപ്ഷൻ സാധ്യമല്ല</string>
     <string name="openpgp_enabled_error_msg">തിരഞ്ഞെടുത്ത ചില സ്വീകർത്താക്കൾ ഈ സവിശേഷതയെ പിന്തുണയ്ക്കുന്നില്ല!</string>
     <string name="enable_encryption">എൻക്രിപ്ഷൻ പ്രാപ്തമാക്കുക</string>
diff --git a/app/ui/legacy/src/main/res/values-nb/strings.xml b/app/ui/legacy/src/main/res/values-nb/strings.xml
index 3c902c25512..fcd5f1c29b0 100644
--- a/app/ui/legacy/src/main/res/values-nb/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nb/strings.xml
@@ -751,9 +751,7 @@ til <xliff:g id="messages_to_load">%d</xliff:g> flere</string>
     <string name="crypto_no_provider_button">Gå til \"Innstillinger\"</string>
     <string name="mail_list_widget_text">K-9 meldingsliste</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Laster…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Laster…</string>
     <string name="openpgp_enabled_error_title">Kryptering er ikke mulig</string>
     <string name="openpgp_enabled_error_msg">Noen av de valgte mottakerne støtter ikke denne funksjonen!</string>
     <string name="enable_encryption">Skru på kryptering</string>
diff --git a/app/ui/legacy/src/main/res/values-nl/strings.xml b/app/ui/legacy/src/main/res/values-nl/strings.xml
index 1541bf35e91..ebac6bd01e7 100644
--- a/app/ui/legacy/src/main/res/values-nl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nl/strings.xml
@@ -825,9 +825,7 @@
     <string name="crypto_no_provider_button">Ga naar Instellingen</string>
     <string name="mail_list_widget_text">K-9-berichtenlijst</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Laden…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Laden…</string>
     <string name="openpgp_enabled_error_title">Versleuteling niet mogelijk</string>
     <string name="openpgp_enabled_error_msg">Sommige van de ontvangers ondersteunen deze functie niet!</string>
     <string name="enable_encryption">Versleuteling inschakelen</string>
diff --git a/app/ui/legacy/src/main/res/values-nn/strings.xml b/app/ui/legacy/src/main/res/values-nn/strings.xml
index 3144ecb0f53..32ee538973b 100644
--- a/app/ui/legacy/src/main/res/values-nn/strings.xml
+++ b/app/ui/legacy/src/main/res/values-nn/strings.xml
@@ -446,9 +446,7 @@
     <string name="crypto_msg_cancelled">Meldinga er kryptert, men avkrypteringa vart avbroten.</string>
     <string name="message_progress_text">Lastar …</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Lastar …</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Lastar …</string>
     <string name="general_settings_title">Generelle innstilingar</string>
     <!--permissions-->
     <!--Name of the swipe action to select a message. Try to keep it short.-->
diff --git a/app/ui/legacy/src/main/res/values-pl/strings.xml b/app/ui/legacy/src/main/res/values-pl/strings.xml
index 6d48f18044d..3dbfacb5df7 100644
--- a/app/ui/legacy/src/main/res/values-pl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pl/strings.xml
@@ -836,9 +836,7 @@
     <string name="crypto_no_provider_button">Przejdź do ustawień</string>
     <string name="mail_list_widget_text">Lista wiadomości K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Wczytywanie…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Wczytywanie…</string>
     <string name="openpgp_enabled_error_title">Szyfrowanie nie jest możliwe</string>
     <string name="openpgp_enabled_error_msg">Część z wybranych odbiorców nie obsługuje tej funkcjonalności!</string>
     <string name="enable_encryption">Włącz szyfrowanie</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
index 309bed39d19..8d70eccaafa 100644
--- a/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rBR/strings.xml
@@ -829,9 +829,7 @@
     <string name="crypto_no_provider_button">Ir para as configurações</string>
     <string name="mail_list_widget_text">Lista de mensagens do K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Carregando…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Carregando…</string>
     <string name="openpgp_enabled_error_title">Não foi possível criptografar</string>
     <string name="openpgp_enabled_error_msg">Alguns dos destinatários selecionados não têm suporte a este recurso!</string>
     <string name="enable_encryption">Habilitar a criptografia</string>
diff --git a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
index 14ddb5b2590..8fb06f4cfbc 100644
--- a/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
+++ b/app/ui/legacy/src/main/res/values-pt-rPT/strings.xml
@@ -828,9 +828,7 @@
     <string name="crypto_no_provider_button">Ir para as configurações</string>
     <string name="mail_list_widget_text">K-9 Lista de mensagens</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">A carregar…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">A carregar…</string>
     <string name="openpgp_enabled_error_title">Não é possível encriptar</string>
     <string name="openpgp_enabled_error_msg">Alguns dos destinatários selecionados não suportam esta funcionalidade!</string>
     <string name="enable_encryption">Ativar encriptação</string>
diff --git a/app/ui/legacy/src/main/res/values-ro/strings.xml b/app/ui/legacy/src/main/res/values-ro/strings.xml
index fc31f801744..19d0198090d 100644
--- a/app/ui/legacy/src/main/res/values-ro/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ro/strings.xml
@@ -828,9 +828,7 @@ cel mult încă <xliff:g id="messages_to_load">%d</xliff:g></string>
     <string name="crypto_no_provider_button">Mergi la Setări</string>
     <string name="mail_list_widget_text">Listă mesaje K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Se încarcă…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Se încarcă…</string>
     <string name="openpgp_enabled_error_title">Criptarea nu este posibilă</string>
     <string name="openpgp_enabled_error_msg">Unii dintre destinatarii selectați nu suportă această facilitate!</string>
     <string name="enable_encryption">Activează criptarea</string>
diff --git a/app/ui/legacy/src/main/res/values-ru/strings.xml b/app/ui/legacy/src/main/res/values-ru/strings.xml
index 3b4a77c5b29..dc27c2b2135 100644
--- a/app/ui/legacy/src/main/res/values-ru/strings.xml
+++ b/app/ui/legacy/src/main/res/values-ru/strings.xml
@@ -835,9 +835,7 @@
     <string name="crypto_no_provider_button">В Настройки</string>
     <string name="mail_list_widget_text">Сообщения K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Загрузка…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Загрузка…</string>
     <string name="openpgp_enabled_error_title">Шифрование невозможно</string>
     <string name="openpgp_enabled_error_msg">Не все выбранные адресаты поддерживают эту возможность!</string>
     <string name="enable_encryption">Включить шифрование</string>
diff --git a/app/ui/legacy/src/main/res/values-sk/strings.xml b/app/ui/legacy/src/main/res/values-sk/strings.xml
index 98db4f85100..eae57e0e2a6 100644
--- a/app/ui/legacy/src/main/res/values-sk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sk/strings.xml
@@ -718,9 +718,7 @@
     <string name="crypto_no_provider_message">Táto správa bola zašifrovaná pomocou OpenPGP\nJe potrebné nakonfigurovať kompatibilnú OpenPGP aplikáciu.</string>
     <string name="mail_list_widget_text">Zoznam správ K-9</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Načítavam…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Načítavam…</string>
     <string name="openpgp_enabled_error_back">Späť</string>
     <string name="general_settings_title">Všeobecné nastavenia</string>
     <!--permissions-->
diff --git a/app/ui/legacy/src/main/res/values-sl/strings.xml b/app/ui/legacy/src/main/res/values-sl/strings.xml
index 90b9db7e84a..436ea9e7206 100644
--- a/app/ui/legacy/src/main/res/values-sl/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sl/strings.xml
@@ -830,9 +830,7 @@ dodatnih <xliff:g id="messages_to_load">%d</xliff:g> sporočil</string>
     <string name="crypto_no_provider_button">Pojdi v Nastavitve</string>
     <string name="mail_list_widget_text">Seznami sporočil</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Poteka nalaganje …</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Poteka nalaganje …</string>
     <string name="openpgp_enabled_error_title">Šifriranje ni mogoče</string>
     <string name="openpgp_enabled_error_msg">Nekateri izmed izbranih prejemnikov ne podpirajo te možnosti!</string>
     <string name="enable_encryption">Omogoči šifriranje</string>
diff --git a/app/ui/legacy/src/main/res/values-sq/strings.xml b/app/ui/legacy/src/main/res/values-sq/strings.xml
index efb1b13b293..069c12065dd 100644
--- a/app/ui/legacy/src/main/res/values-sq/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sq/strings.xml
@@ -824,9 +824,7 @@
     <string name="crypto_no_provider_button">Kaloni te Rregullimet</string>
     <string name="mail_list_widget_text">Listë K-9 Mesazhesh</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Po ngarkohet…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Po ngarkohet…</string>
     <string name="openpgp_enabled_error_title">Fshehtëzim jo i mundshëm</string>
     <string name="openpgp_enabled_error_msg">Disa nga marrësit e përzgjedhur nuk e mbulojnë këtë veçori!</string>
     <string name="enable_encryption">Aktivizo Fshehtëzimin</string>
diff --git a/app/ui/legacy/src/main/res/values-sr/strings.xml b/app/ui/legacy/src/main/res/values-sr/strings.xml
index 7fd0a48387b..348cdead259 100644
--- a/app/ui/legacy/src/main/res/values-sr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sr/strings.xml
@@ -764,9 +764,7 @@
     <string name="crypto_no_provider_button">Иди на Поставке</string>
     <string name="mail_list_widget_text">К-9 списак порука</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Учитавам…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Учитавам…</string>
     <string name="openpgp_enabled_error_title">Шифровање није могуће</string>
     <string name="openpgp_enabled_error_msg">Неки од изабраних прималаца не подржавају ово!</string>
     <string name="enable_encryption">Укључи шифровање</string>
diff --git a/app/ui/legacy/src/main/res/values-sv/strings.xml b/app/ui/legacy/src/main/res/values-sv/strings.xml
index 3f8129fd769..aaad272ea5e 100644
--- a/app/ui/legacy/src/main/res/values-sv/strings.xml
+++ b/app/ui/legacy/src/main/res/values-sv/strings.xml
@@ -822,9 +822,7 @@
     <string name="crypto_no_provider_button">Gå till inställningar</string>
     <string name="mail_list_widget_text">K-9 Meddelandelista</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Läser in…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Läser in…</string>
     <string name="openpgp_enabled_error_title">Kryptering inte möjligt</string>
     <string name="openpgp_enabled_error_msg">Några av de valda mottagarna stöder inte denna funktion!</string>
     <string name="enable_encryption">Aktivera kryptering</string>
diff --git a/app/ui/legacy/src/main/res/values-tr/strings.xml b/app/ui/legacy/src/main/res/values-tr/strings.xml
index 6f4809383fb..b83c09115c7 100644
--- a/app/ui/legacy/src/main/res/values-tr/strings.xml
+++ b/app/ui/legacy/src/main/res/values-tr/strings.xml
@@ -808,9 +808,7 @@
     <string name="crypto_no_provider_button">Ayarlara Git</string>
     <string name="mail_list_widget_text">K-9 İleti Listesi</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Yükleniyor…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Yükleniyor…</string>
     <string name="openpgp_enabled_error_title">Şifreleme yapılamaz</string>
     <string name="openpgp_enabled_error_msg">Seçilen bazı alıcılar bu özelliği desteklemiyor!</string>
     <string name="enable_encryption">Şifreleme etkin</string>
diff --git a/app/ui/legacy/src/main/res/values-uk/strings.xml b/app/ui/legacy/src/main/res/values-uk/strings.xml
index 6685e17c9a8..87ee990656c 100644
--- a/app/ui/legacy/src/main/res/values-uk/strings.xml
+++ b/app/ui/legacy/src/main/res/values-uk/strings.xml
@@ -834,9 +834,7 @@
     <string name="crypto_no_provider_button">Перейти до Налаштувань</string>
     <string name="mail_list_widget_text">K-9 Список повідомлень</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">Завантаження…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">Завантаження…</string>
     <string name="openpgp_enabled_error_title">Шифрування неможливе</string>
     <string name="openpgp_enabled_error_msg">Деякі з вибраних адресатів не підтримують цю функцію.</string>
     <string name="enable_encryption">Увімкнути шифрування</string>
diff --git a/app/ui/legacy/src/main/res/values-vi/strings.xml b/app/ui/legacy/src/main/res/values-vi/strings.xml
index 66c8fdd541e..a96f0bd0072 100644
--- a/app/ui/legacy/src/main/res/values-vi/strings.xml
+++ b/app/ui/legacy/src/main/res/values-vi/strings.xml
@@ -699,7 +699,6 @@
     <string name="messageview_decrypt_retry">Thử lại</string>
     <string name="messageview_decrypt_incomplete">Tin nhắn mã hóa bắt buộc tải xuống để giải mã.</string>
     <string name="recipient_error_non_ascii">Ký tự đặc biệt không được hỗ trợ!</string>
-    <string name="message_list_widget_list_item_loading">Đang tải…</string>
     <string name="openpgp_enabled_error_back">Quay lại</string>
     <string name="openpgp_enabled_error_disable">Hủy kích hoạt Mã hóa</string>
     <string name="openpgp_encryption">Mã hóa OpenPGP</string>
@@ -810,7 +809,6 @@
     <string name="message_progress_text">Đang tải…</string>
     <string name="messageview_crypto_error_title">Lỗi giải mã email</string>
     <string name="recipient_error_parse_failed">Lỗi xử lý địa chỉ!</string>
-    <string name="message_list_widget_initializing">Đang tải…</string>
     <string name="openpgp_enabled_error_title">Không thể mã hóa</string>
     <string name="openpgp_description_text1">Việc mã hóa tin nhắn đảm bảo chúng chỉ được đọc bởi đúng người nhận, và không một ai khác.</string>
     <string name="openpgp_description_text3">Việc mã hóa chỉ khả thi nếu tất cả người nhận đều hỗ trợ, và họ phải gửi bạn một email trước đó.</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
index 5305006a3e2..128a586112c 100644
--- a/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rCN/strings.xml
@@ -819,9 +819,7 @@
     <string name="crypto_no_provider_button">转到设置</string>
     <string name="mail_list_widget_text">K-9 邮件列表</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">正在加载…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">正在加载…</string>
     <string name="openpgp_enabled_error_title">无法加密</string>
     <string name="openpgp_enabled_error_msg">某些选定的收件人不支持此功能！</string>
     <string name="enable_encryption">启用加密</string>
diff --git a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
index ce9fa9f9b83..84836594d8d 100644
--- a/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
+++ b/app/ui/legacy/src/main/res/values-zh-rTW/strings.xml
@@ -815,9 +815,7 @@
     <string name="crypto_no_provider_button">前往設定</string>
     <string name="mail_list_widget_text">K-9 訊息列表</string>
     <!--Displayed in the the message list widget when the app hasn't had a chance to send content to it yet-->
-    <string name="message_list_widget_initializing">載入中…</string>
     <!--Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough-->
-    <string name="message_list_widget_list_item_loading">載入中…</string>
     <string name="openpgp_enabled_error_title">無法加密</string>
     <string name="openpgp_enabled_error_msg">有些已選定的收件人不支援此功能！</string>
     <string name="enable_encryption">啟用加密</string>
diff --git a/app/ui/legacy/src/main/res/values/strings.xml b/app/ui/legacy/src/main/res/values/strings.xml
index b52dc1c15f7..75282ebf657 100644
--- a/app/ui/legacy/src/main/res/values/strings.xml
+++ b/app/ui/legacy/src/main/res/values/strings.xml
@@ -1007,10 +1007,6 @@
     <string name="crypto_no_provider_button">Go to Settings</string>
 
     <string name="mail_list_widget_text">K-9 Message List</string>
-    <!-- Displayed in the the message list widget when the app hasn't had a chance to send content to it yet -->
-    <string name="message_list_widget_initializing">Loading…</string>
-    <!-- Might be displayed in the message list widget when the list is scrolled and new data can't be fetched fast enough -->
-    <string name="message_list_widget_list_item_loading">Loading…</string>
 
     <string name="openpgp_enabled_error_title">Encryption not possible</string>
     <string name="openpgp_enabled_error_msg">Some of the selected recipients don\'t support this feature!</string>
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt b/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt
deleted file mode 100644
index 5fc1442f549..00000000000
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetConfig.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.k9mail.ui.widget.list
-
-interface MessageListWidgetConfig {
-    val providerClass: Class<out MessageListWidgetProvider>
-}
diff --git a/feature/widget/message-list/build.gradle.kts b/feature/widget/message-list/build.gradle.kts
new file mode 100644
index 00000000000..249a35a9157
--- /dev/null
+++ b/feature/widget/message-list/build.gradle.kts
@@ -0,0 +1,14 @@
+plugins {
+    id(ThunderbirdPlugins.Library.android)
+}
+
+dependencies {
+    implementation(projects.app.ui.legacy)
+    implementation(projects.app.core)
+
+    implementation(libs.timber)
+}
+
+android {
+    namespace = "app.k9mail.feature.widget.message.list"
+}
diff --git a/app/ui/message-list-widget/src/main/AndroidManifest.xml b/feature/widget/message-list/src/main/AndroidManifest.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/AndroidManifest.xml
rename to feature/widget/message-list/src/main/AndroidManifest.xml
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt
similarity index 92%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt
index 7c9682efda8..11ec458b349 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetProvider.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import android.app.PendingIntent
 import android.appwidget.AppWidgetManager
@@ -13,9 +13,8 @@ import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
 import com.fsck.k9.search.SearchAccount.Companion.createUnifiedInboxAccount
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import com.fsck.k9.ui.R as UiR
 
-open class MessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
+abstract class BaseMessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
     private val messageListWidgetManager: MessageListWidgetManager by inject()
 
     override fun onEnabled(context: Context) {
@@ -35,7 +34,7 @@ open class MessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
     private fun updateAppWidget(context: Context, appWidgetManager: AppWidgetManager, appWidgetId: Int) {
         val views = RemoteViews(context.packageName, R.layout.message_list_widget_layout)
 
-        views.setTextViewText(R.id.folder, context.getString(UiR.string.integrated_inbox_title))
+        views.setTextViewText(R.id.folder, context.getString(R.string.message_list_widget_inbox_title))
 
         val intent = Intent(context, MessageListWidgetService::class.java)
         views.setRemoteAdapter(R.id.listView, intent)
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
similarity index 85%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
index dbee532f8c5..d70caa03713 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/KoinModule.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import org.koin.dsl.module
 
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListConfig.kt
similarity index 85%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListConfig.kt
index 2b34ad90448..ca540e00be6 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListConfig.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListConfig.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import com.fsck.k9.Account.SortType
 import com.fsck.k9.search.LocalSearch
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt
similarity index 91%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt
index 19c266df108..2a0be55c153 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItem.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItem.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import com.fsck.k9.controller.MessageReference
 
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt
similarity index 90%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt
index 8b3bf20c83a..6f4a93259c2 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListItemMapper.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListItemMapper.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import com.fsck.k9.Account
 import com.fsck.k9.controller.MessageReference
@@ -48,6 +48,7 @@ internal class MessageListItemMapper(
         )
     }
 
+    @Suppress("ImplicitDefaultLocale")
     private fun formatDate(date: Long): String {
         calendar.timeInMillis = date
         val dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)
@@ -57,6 +58,10 @@ internal class MessageListItemMapper(
     }
 
     private fun createUniqueId(account: Account, messageId: Long): Long {
-        return ((account.accountNumber + 1).toLong() shl 52) + messageId
+        return ((account.accountNumber + 1).toLong() shl ACCOUNT_NUMBER_BIT_SHIFT) + messageId
+    }
+
+    private companion object {
+        const val ACCOUNT_NUMBER_BIT_SHIFT = 52
     }
 }
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt
similarity index 98%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt
index d392ec7195d..c128528e1f7 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListLoader.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListLoader.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import com.fsck.k9.Account
 import com.fsck.k9.Account.SortType
@@ -16,6 +16,7 @@ internal class MessageListLoader(
     private val messageHelper: MessageHelper,
 ) {
 
+    @Suppress("TooGenericExceptionCaught")
     fun getMessageList(config: MessageListConfig): List<MessageListItem> {
         return try {
             getMessageListInfo(config)
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt
similarity index 97%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt
index 9d94ae7b5e8..7edef6e1c8a 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListRemoteViewFactory.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import android.content.Context
 import android.graphics.Typeface
@@ -15,8 +15,8 @@ import com.fsck.k9.search.LocalSearch
 import com.fsck.k9.search.SearchAccount
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.inject
-import com.fsck.k9.ui.R as UiR
 
+@Suppress("TooManyFunctions")
 internal class MessageListRemoteViewFactory(private val context: Context) : RemoteViewsFactory, KoinComponent {
     private val messageListLoader: MessageListLoader by inject()
 
@@ -105,7 +105,7 @@ internal class MessageListRemoteViewFactory(private val context: Context) : Remo
     override fun getLoadingView(): RemoteViews {
         return RemoteViews(context.packageName, R.layout.message_list_widget_list_item_loading).apply {
             // Set the text here instead of in the layout so the app language override is used
-            setTextViewText(R.id.loadingText, context.getString(UiR.string.message_list_widget_list_item_loading))
+            setTextViewText(R.id.loadingText, context.getString(R.string.message_list_widget_list_item_loading))
         }
     }
 
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetConfig.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetConfig.kt
new file mode 100644
index 00000000000..8311472344d
--- /dev/null
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetConfig.kt
@@ -0,0 +1,5 @@
+package app.k9mail.feature.widget.message.list
+
+interface MessageListWidgetConfig {
+    val providerClass: Class<out BaseMessageListWidgetProvider>
+}
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt
similarity index 97%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt
index 3335c482cdc..831e16e6a12 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetManager.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
@@ -33,6 +33,7 @@ class MessageListWidgetManager(
         }
     }
 
+    @Suppress("TooGenericExceptionCaught")
     private fun onMessageListChanged() {
         try {
             triggerMessageListWidgetUpdate()
diff --git a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt
similarity index 85%
rename from app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt
rename to feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt
index 09a82e25240..2d0de868ba9 100644
--- a/app/ui/message-list-widget/src/main/java/app/k9mail/ui/widget/list/MessageListWidgetService.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt
@@ -1,4 +1,4 @@
-package app.k9mail.ui.widget.list
+package app.k9mail.feature.widget.message.list
 
 import android.content.Intent
 import android.widget.RemoteViewsService
diff --git a/app/ui/message-list-widget/src/main/res/drawable-xxhdpi/message_list_widget_preview.png b/feature/widget/message-list/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
rename to feature/widget/message-list/src/main/res/drawable-xxhdpi/message_list_widget_preview.png
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml
similarity index 95%
rename from app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
rename to feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml
index 715bb8ff315..3e223052f89 100644
--- a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_layout.xml
+++ b/feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml
@@ -30,7 +30,7 @@
             android:layout_width="56dp"
             android:layout_height="match_parent"
             android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/compose_action"
+            android:contentDescription="@string/message_list_widget_compose_action"
             android:scaleType="center"
             android:src="@drawable/ic_edit" />
 
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_list_item.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item.xml
rename to feature/widget/message-list/src/main/res/layout/message_list_widget_list_item.xml
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item_loading.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_list_item_loading.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/layout/message_list_widget_list_item_loading.xml
rename to feature/widget/message-list/src/main/res/layout/message_list_widget_list_item_loading.xml
diff --git a/app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_loading.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/layout/message_list_widget_loading.xml
rename to feature/widget/message-list/src/main/res/layout/message_list_widget_loading.xml
diff --git a/feature/widget/message-list/src/main/res/values-ar/strings.xml b/feature/widget/message-list/src/main/res/values-ar/strings.xml
new file mode 100644
index 00000000000..9333b5079d4
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ar/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">أنشِئ</string>
+    <string name="message_list_widget_list_item_loading">يُحمل…</string>
+    <string name="message_list_widget_initializing">يُحمل…</string>
+    <string name="message_list_widget_inbox_title">البريد الوارد الموحَّد</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-az/strings.xml b/feature/widget/message-list/src/main/res/values-az/strings.xml
new file mode 100644
index 00000000000..2a7c61ced80
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-az/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Tərtib et</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-be/strings.xml b/feature/widget/message-list/src/main/res/values-be/strings.xml
new file mode 100644
index 00000000000..df86c5ed435
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-be/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Напісаць</string>
+    <string name="message_list_widget_list_item_loading">Загрузка…</string>
+    <string name="message_list_widget_initializing">Загрузка…</string>
+    <string name="message_list_widget_inbox_title">Усе атрыманыя</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-bg/strings.xml b/feature/widget/message-list/src/main/res/values-bg/strings.xml
new file mode 100644
index 00000000000..225c3632403
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-bg/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Състави</string>
+    <string name="message_list_widget_list_item_loading">Зареждане…</string>
+    <string name="message_list_widget_initializing">Зареждане…</string>
+    <string name="message_list_widget_inbox_title">Обща входяща кутия</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-br/strings.xml b/feature/widget/message-list/src/main/res/values-br/strings.xml
new file mode 100644
index 00000000000..267b7b99af1
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-br/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Skridaozañ</string>
+    <string name="message_list_widget_list_item_loading">O kargañ…</string>
+    <string name="message_list_widget_initializing">O kargañ…</string>
+    <string name="message_list_widget_inbox_title">Boest degemer unanet</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-bs/strings.xml b/feature/widget/message-list/src/main/res/values-bs/strings.xml
new file mode 100644
index 00000000000..9b0e4e02b75
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-bs/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Sastavi</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ca/strings.xml b/feature/widget/message-list/src/main/res/values-ca/strings.xml
new file mode 100644
index 00000000000..5017dccd062
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ca/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Redacta</string>
+    <string name="message_list_widget_list_item_loading">S\'està carregant…</string>
+    <string name="message_list_widget_initializing">S\'està carregant…</string>
+    <string name="message_list_widget_inbox_title">Bústia d\'entrada unificada</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-co/strings.xml b/feature/widget/message-list/src/main/res/values-co/strings.xml
new file mode 100644
index 00000000000..cca4d83f018
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-co/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Cumpone</string>
+    <string name="message_list_widget_list_item_loading">Caricamentu…</string>
+    <string name="message_list_widget_initializing">Caricamentu…</string>
+    <string name="message_list_widget_inbox_title">Scatula di ricezzione unificata</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-cs/strings.xml b/feature/widget/message-list/src/main/res/values-cs/strings.xml
new file mode 100644
index 00000000000..b8921fcbd8a
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-cs/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Nová</string>
+    <string name="message_list_widget_list_item_loading">Načítání…</string>
+    <string name="message_list_widget_initializing">Načítání…</string>
+    <string name="message_list_widget_inbox_title">Integrovaná doručená pošta</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-cy/strings.xml b/feature/widget/message-list/src/main/res/values-cy/strings.xml
new file mode 100644
index 00000000000..a543836e835
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-cy/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Ysgrifennu</string>
+    <string name="message_list_widget_list_item_loading">Yn llwytho…</string>
+    <string name="message_list_widget_initializing">Yn llwytho…</string>
+    <string name="message_list_widget_inbox_title">Mewnflwch Unedig</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-da/strings.xml b/feature/widget/message-list/src/main/res/values-da/strings.xml
new file mode 100644
index 00000000000..e9aa7a82a93
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-da/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Skriv</string>
+    <string name="message_list_widget_list_item_loading">Indlæser…</string>
+    <string name="message_list_widget_initializing">Indlæser…</string>
+    <string name="message_list_widget_inbox_title">Fælles indbakke</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-de/strings.xml b/feature/widget/message-list/src/main/res/values-de/strings.xml
new file mode 100644
index 00000000000..9a8bb253bb0
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-de/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Verfassen</string>
+    <string name="message_list_widget_list_item_loading">Ladevorgang…</string>
+    <string name="message_list_widget_initializing">Ladevorgang…</string>
+    <string name="message_list_widget_inbox_title">Gemeinsamer Posteingang</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-el/strings.xml b/feature/widget/message-list/src/main/res/values-el/strings.xml
new file mode 100644
index 00000000000..38d4d92872d
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-el/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Δημιουργία νέου</string>
+    <string name="message_list_widget_list_item_loading">Φόρτωση…</string>
+    <string name="message_list_widget_initializing">Φόρτωση…</string>
+    <string name="message_list_widget_inbox_title">Ενιαία Εισερχόμενα</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-en-rGB/strings.xml b/feature/widget/message-list/src/main/res/values-en-rGB/strings.xml
new file mode 100644
index 00000000000..853281a5e72
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-en-rGB/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Compose</string>
+    <string name="message_list_widget_list_item_loading">Loading…</string>
+    <string name="message_list_widget_initializing">Loading…</string>
+    <string name="message_list_widget_inbox_title">Unified Inbox</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-eo/strings.xml b/feature/widget/message-list/src/main/res/values-eo/strings.xml
new file mode 100644
index 00000000000..9765bc44120
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-eo/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Krei</string>
+    <string name="message_list_widget_list_item_loading">Ŝargado…</string>
+    <string name="message_list_widget_initializing">Ŝargado…</string>
+    <string name="message_list_widget_inbox_title">Unuigita ricevujo</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-es/strings.xml b/feature/widget/message-list/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000000..a3001c34f40
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-es/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Redactar</string>
+    <string name="message_list_widget_list_item_loading">Cargando…</string>
+    <string name="message_list_widget_initializing">Cargando…</string>
+    <string name="message_list_widget_inbox_title">Entrada unificada</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-et/strings.xml b/feature/widget/message-list/src/main/res/values-et/strings.xml
new file mode 100644
index 00000000000..6daa962b5bb
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-et/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Koosta</string>
+    <string name="message_list_widget_list_item_loading">Laadib…</string>
+    <string name="message_list_widget_initializing">Laadib…</string>
+    <string name="message_list_widget_inbox_title">Koondsisendkaust</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-eu/strings.xml b/feature/widget/message-list/src/main/res/values-eu/strings.xml
new file mode 100644
index 00000000000..160a7512594
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-eu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Idatzi</string>
+    <string name="message_list_widget_list_item_loading">Kargatzen…</string>
+    <string name="message_list_widget_initializing">Kargatzen…</string>
+    <string name="message_list_widget_inbox_title">Sarrerako ontzi bateratua</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-fa/strings.xml b/feature/widget/message-list/src/main/res/values-fa/strings.xml
new file mode 100644
index 00000000000..1f0f849838d
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-fa/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">نوشتن</string>
+    <string name="message_list_widget_list_item_loading">بارگیری…</string>
+    <string name="message_list_widget_initializing">بارگیری…</string>
+    <string name="message_list_widget_inbox_title">صندوق ورودی یکپارچه</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-fi/strings.xml b/feature/widget/message-list/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000000..322345b66df
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-fi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Kirjoita</string>
+    <string name="message_list_widget_list_item_loading">Ladataan…</string>
+    <string name="message_list_widget_initializing">Ladataan…</string>
+    <string name="message_list_widget_inbox_title">Yhdistetty saapuneet</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-fr/strings.xml b/feature/widget/message-list/src/main/res/values-fr/strings.xml
new file mode 100644
index 00000000000..47bf4107737
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-fr/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Rédiger
+</string>
+    <string name="message_list_widget_list_item_loading">Chargement…</string>
+    <string name="message_list_widget_initializing">Chargement…</string>
+    <string name="message_list_widget_inbox_title">Boîte de réception unifiée</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-fy/strings.xml b/feature/widget/message-list/src/main/res/values-fy/strings.xml
new file mode 100644
index 00000000000..3c6f6ac13f5
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-fy/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Nij berjocht</string>
+    <string name="message_list_widget_list_item_loading">Lade…</string>
+    <string name="message_list_widget_initializing">Lade…</string>
+    <string name="message_list_widget_inbox_title">Kombinearre Postfek YN</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-gd/strings.xml b/feature/widget/message-list/src/main/res/values-gd/strings.xml
new file mode 100644
index 00000000000..6c58f4f7e88
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-gd/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Sgrìobh</string>
+    <string name="message_list_widget_list_item_loading">’Ga luchdadh…</string>
+    <string name="message_list_widget_initializing">’Ga luchdadh…</string>
+    <string name="message_list_widget_inbox_title">An t-oll-bhogsa</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-gl/strings.xml b/feature/widget/message-list/src/main/res/values-gl/strings.xml
new file mode 100644
index 00000000000..fc895b4e982
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-gl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Redactar</string>
+    <string name="message_list_widget_list_item_loading">A cargar…</string>
+    <string name="message_list_widget_initializing">A cargar…</string>
+    <string name="message_list_widget_inbox_title">Entrada unificada</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-hi/strings.xml b/feature/widget/message-list/src/main/res/values-hi/strings.xml
new file mode 100644
index 00000000000..1a845d226ad
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-hi/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">बनाएं</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-hr/strings.xml b/feature/widget/message-list/src/main/res/values-hr/strings.xml
new file mode 100644
index 00000000000..cdc736460c4
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-hr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Sastavi</string>
+    <string name="message_list_widget_list_item_loading">Učitavam…</string>
+    <string name="message_list_widget_initializing">Učitavam…</string>
+    <string name="message_list_widget_inbox_title">Objedinjena Dolazna Pošta</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-hu/strings.xml b/feature/widget/message-list/src/main/res/values-hu/strings.xml
new file mode 100644
index 00000000000..c470c24044d
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-hu/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Írás</string>
+    <string name="message_list_widget_list_item_loading">Betöltés…</string>
+    <string name="message_list_widget_initializing">Betöltés…</string>
+    <string name="message_list_widget_inbox_title">Egységes beérkezett üzenetek</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-hy/strings.xml b/feature/widget/message-list/src/main/res/values-hy/strings.xml
new file mode 100644
index 00000000000..b05afa37a80
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-hy/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Գրել</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-in/strings.xml b/feature/widget/message-list/src/main/res/values-in/strings.xml
new file mode 100644
index 00000000000..5e89617a37f
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-in/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Menyusun</string>
+    <string name="message_list_widget_list_item_loading">Memuat…</string>
+    <string name="message_list_widget_initializing">Memuat…</string>
+    <string name="message_list_widget_inbox_title">Kotak Masuk Terpadu</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-is/strings.xml b/feature/widget/message-list/src/main/res/values-is/strings.xml
new file mode 100644
index 00000000000..fe8fa326c64
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-is/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Semja</string>
+    <string name="message_list_widget_list_item_loading">Hleður…</string>
+    <string name="message_list_widget_initializing">Hleður…</string>
+    <string name="message_list_widget_inbox_title">Sameinað innhólf</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-it/strings.xml b/feature/widget/message-list/src/main/res/values-it/strings.xml
new file mode 100644
index 00000000000..af290266c6e
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-it/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Componi</string>
+    <string name="message_list_widget_list_item_loading">Caricamento…</string>
+    <string name="message_list_widget_initializing">Caricamento…</string>
+    <string name="message_list_widget_inbox_title">Posta combinata</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-iw/strings.xml b/feature/widget/message-list/src/main/res/values-iw/strings.xml
new file mode 100644
index 00000000000..285a8557e53
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-iw/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">חבר</string>
+    <string name="message_list_widget_list_item_loading">טוען…</string>
+    <string name="message_list_widget_initializing">טוען…</string>
+    <string name="message_list_widget_inbox_title">תיבת דואר נכנס אחידה</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ja/strings.xml b/feature/widget/message-list/src/main/res/values-ja/strings.xml
new file mode 100644
index 00000000000..dfcfdcc2932
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ja/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">作成</string>
+    <string name="message_list_widget_list_item_loading">読み込み中…</string>
+    <string name="message_list_widget_initializing">読み込み中…</string>
+    <string name="message_list_widget_inbox_title">統合受信トレイ</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ka/strings.xml b/feature/widget/message-list/src/main/res/values-ka/strings.xml
new file mode 100644
index 00000000000..a3c9952ef61
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ka/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">შექმნა</string>
+    <string name="message_list_widget_list_item_loading">ჩატვირთვა…</string>
+    <string name="message_list_widget_initializing">ჩატვირთვა…</string>
+    <string name="message_list_widget_inbox_title">გაერთიანებული შემავალი</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ko/strings.xml b/feature/widget/message-list/src/main/res/values-ko/strings.xml
new file mode 100644
index 00000000000..ba7a975e1f6
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ko/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">작성</string>
+    <string name="message_list_widget_list_item_loading">로딩 중…</string>
+    <string name="message_list_widget_initializing">로딩 중…</string>
+    <string name="message_list_widget_inbox_title">통합 편지함</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-lt/strings.xml b/feature/widget/message-list/src/main/res/values-lt/strings.xml
new file mode 100644
index 00000000000..2ac2b5ab2ae
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-lt/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Sukurti</string>
+    <string name="message_list_widget_list_item_loading">Įkeliama…</string>
+    <string name="message_list_widget_initializing">Įkeliama…</string>
+    <string name="message_list_widget_inbox_title">Suvestiniai gautieji</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-lv/strings.xml b/feature/widget/message-list/src/main/res/values-lv/strings.xml
new file mode 100644
index 00000000000..cb90ceb2d0b
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-lv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Rakstīt ziņu</string>
+    <string name="message_list_widget_list_item_loading">Ielādē…</string>
+    <string name="message_list_widget_initializing">Ielādē…</string>
+    <string name="message_list_widget_inbox_title">Apvienotā Iesūtne</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ml/strings.xml b/feature/widget/message-list/src/main/res/values-ml/strings.xml
new file mode 100644
index 00000000000..d49219bb3d9
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ml/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">രചിക്കുക</string>
+    <string name="message_list_widget_list_item_loading">ലോഡുചെയ്യുന്നു…</string>
+    <string name="message_list_widget_initializing">ലോഡുചെയ്യുന്നു…</string>
+    <string name="message_list_widget_inbox_title">ഏകീകൃത ഇൻ‌ബോക്സ്</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-nb/strings.xml b/feature/widget/message-list/src/main/res/values-nb/strings.xml
new file mode 100644
index 00000000000..e5ed3d8cd69
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-nb/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Skriv</string>
+    <string name="message_list_widget_list_item_loading">Laster…</string>
+    <string name="message_list_widget_initializing">Laster…</string>
+    <string name="message_list_widget_inbox_title">Samlet innboks</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-nl/strings.xml b/feature/widget/message-list/src/main/res/values-nl/strings.xml
new file mode 100644
index 00000000000..17b135735f5
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-nl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Nieuw bericht</string>
+    <string name="message_list_widget_list_item_loading">Laden…</string>
+    <string name="message_list_widget_initializing">Laden…</string>
+    <string name="message_list_widget_inbox_title">Gecombineerde Postvak IN</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-nn/strings.xml b/feature/widget/message-list/src/main/res/values-nn/strings.xml
new file mode 100644
index 00000000000..1dd116ac081
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-nn/strings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Skriv</string>
+    <string name="message_list_widget_list_item_loading">Lastar …</string>
+    <string name="message_list_widget_initializing">Lastar …</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-pl/strings.xml b/feature/widget/message-list/src/main/res/values-pl/strings.xml
new file mode 100644
index 00000000000..126f6f9ee88
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-pl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Nowa wiadomość</string>
+    <string name="message_list_widget_list_item_loading">Wczytywanie…</string>
+    <string name="message_list_widget_initializing">Wczytywanie…</string>
+    <string name="message_list_widget_inbox_title">Zintegrowana odbiorcza</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-pt-rBR/strings.xml b/feature/widget/message-list/src/main/res/values-pt-rBR/strings.xml
new file mode 100644
index 00000000000..3bded742fde
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-pt-rBR/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Escrever</string>
+    <string name="message_list_widget_list_item_loading">Carregando…</string>
+    <string name="message_list_widget_initializing">Carregando…</string>
+    <string name="message_list_widget_inbox_title">Caixa de Entrada Unificada</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-pt-rPT/strings.xml b/feature/widget/message-list/src/main/res/values-pt-rPT/strings.xml
new file mode 100644
index 00000000000..d8dd954dd6f
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-pt-rPT/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Compor</string>
+    <string name="message_list_widget_list_item_loading">A carregar…</string>
+    <string name="message_list_widget_initializing">A carregar…</string>
+    <string name="message_list_widget_inbox_title">Caixa de entrada unificada</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ro/strings.xml b/feature/widget/message-list/src/main/res/values-ro/strings.xml
new file mode 100644
index 00000000000..be80dc28b14
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ro/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Compune</string>
+    <string name="message_list_widget_list_item_loading">Se încarcă…</string>
+    <string name="message_list_widget_initializing">Se încarcă…</string>
+    <string name="message_list_widget_inbox_title">Căsuță poștală unificată</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ru/strings.xml b/feature/widget/message-list/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000000..73803b0ec9e
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ru/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Создать</string>
+    <string name="message_list_widget_list_item_loading">Загрузка…</string>
+    <string name="message_list_widget_initializing">Загрузка…</string>
+    <string name="message_list_widget_inbox_title">Входящие</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-sk/strings.xml b/feature/widget/message-list/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000000..206f76b43e4
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-sk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Napísať</string>
+    <string name="message_list_widget_list_item_loading">Načítavam…</string>
+    <string name="message_list_widget_initializing">Načítavam…</string>
+    <string name="message_list_widget_inbox_title">Jednotná schránka</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-sl/strings.xml b/feature/widget/message-list/src/main/res/values-sl/strings.xml
new file mode 100644
index 00000000000..1f2082fc66c
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-sl/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Sestavi sporočilo</string>
+    <string name="message_list_widget_list_item_loading">Poteka nalaganje …</string>
+    <string name="message_list_widget_initializing">Poteka nalaganje …</string>
+    <string name="message_list_widget_inbox_title">Skupna mapa prejetih sporočil</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-sq/strings.xml b/feature/widget/message-list/src/main/res/values-sq/strings.xml
new file mode 100644
index 00000000000..f25d626815b
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-sq/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Hartoni</string>
+    <string name="message_list_widget_list_item_loading">Po ngarkohet…</string>
+    <string name="message_list_widget_initializing">Po ngarkohet…</string>
+    <string name="message_list_widget_inbox_title">Kuti Poste e Njësuar</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-sr/strings.xml b/feature/widget/message-list/src/main/res/values-sr/strings.xml
new file mode 100644
index 00000000000..44d5a1f6385
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-sr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Састави</string>
+    <string name="message_list_widget_list_item_loading">Учитавам…</string>
+    <string name="message_list_widget_initializing">Учитавам…</string>
+    <string name="message_list_widget_inbox_title">Обједињено сандуче</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-sv/strings.xml b/feature/widget/message-list/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000000..5af6c025697
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-sv/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Skriv</string>
+    <string name="message_list_widget_list_item_loading">Läser in…</string>
+    <string name="message_list_widget_initializing">Läser in…</string>
+    <string name="message_list_widget_inbox_title">Samlad inkorg</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-ta-rIN/strings.xml b/feature/widget/message-list/src/main/res/values-ta-rIN/strings.xml
new file mode 100644
index 00000000000..87dc1324f6e
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-ta-rIN/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">எழுது</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-tr/strings.xml b/feature/widget/message-list/src/main/res/values-tr/strings.xml
new file mode 100644
index 00000000000..9db5a7b8797
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-tr/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Oluştur</string>
+    <string name="message_list_widget_list_item_loading">Yükleniyor…</string>
+    <string name="message_list_widget_initializing">Yükleniyor…</string>
+    <string name="message_list_widget_inbox_title">Birleşik Gelen Kutusu</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-uk/strings.xml b/feature/widget/message-list/src/main/res/values-uk/strings.xml
new file mode 100644
index 00000000000..fdbf0bc00e8
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-uk/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Написати новий лист</string>
+    <string name="message_list_widget_list_item_loading">Завантаження…</string>
+    <string name="message_list_widget_initializing">Завантаження…</string>
+    <string name="message_list_widget_inbox_title">Об\'єднані Вхідні</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-vi/strings.xml b/feature/widget/message-list/src/main/res/values-vi/strings.xml
new file mode 100644
index 00000000000..6552d92a582
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-vi/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Soạn thư</string>
+    <string name="message_list_widget_list_item_loading">Đang tải…</string>
+    <string name="message_list_widget_initializing">Đang tải…</string>
+    <string name="message_list_widget_inbox_title">Hộp thư đồng nhất</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-zh-rCN/strings.xml b/feature/widget/message-list/src/main/res/values-zh-rCN/strings.xml
new file mode 100644
index 00000000000..dee2cb7fd37
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-zh-rCN/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">撰写</string>
+    <string name="message_list_widget_list_item_loading">正在加载…</string>
+    <string name="message_list_widget_initializing">正在加载…</string>
+    <string name="message_list_widget_inbox_title">统一收件箱</string>
+</resources>
diff --git a/feature/widget/message-list/src/main/res/values-zh-rTW/strings.xml b/feature/widget/message-list/src/main/res/values-zh-rTW/strings.xml
new file mode 100644
index 00000000000..d740ad3d46d
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values-zh-rTW/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">新郵件</string>
+    <string name="message_list_widget_list_item_loading">載入中…</string>
+    <string name="message_list_widget_initializing">載入中…</string>
+    <string name="message_list_widget_inbox_title">全域收件匣</string>
+</resources>
diff --git a/app/ui/message-list-widget/src/main/res/values/colors.xml b/feature/widget/message-list/src/main/res/values/colors.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/values/colors.xml
rename to feature/widget/message-list/src/main/res/values/colors.xml
diff --git a/feature/widget/message-list/src/main/res/values/strings.xml b/feature/widget/message-list/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..853281a5e72
--- /dev/null
+++ b/feature/widget/message-list/src/main/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="message_list_widget_compose_action">Compose</string>
+    <string name="message_list_widget_list_item_loading">Loading…</string>
+    <string name="message_list_widget_initializing">Loading…</string>
+    <string name="message_list_widget_inbox_title">Unified Inbox</string>
+</resources>
diff --git a/app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml b/feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml
similarity index 100%
rename from app/ui/message-list-widget/src/main/res/xml/message_list_widget_info.xml
rename to feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml
diff --git a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/KoinModule.kt b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/KoinModule.kt
index bfa299cb517..0aaf4731776 100644
--- a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/KoinModule.kt
+++ b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/KoinModule.kt
@@ -23,7 +23,7 @@ val unreadWidgetModule = module {
     single {
         UnreadWidgetUpdater(
             context = get(),
-            classProvider = get(),
+            config = get(),
         )
     }
     single { UnreadWidgetUpdateListener(unreadWidgetUpdater = get()) }
diff --git a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetClassProvider.kt b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetClassProvider.kt
deleted file mode 100644
index a5dbb7585e9..00000000000
--- a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetClassProvider.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.k9mail.feature.widget.unread
-
-fun interface UnreadWidgetClassProvider {
-    fun getUnreadWidgetClass(): Class<*>
-}
diff --git a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetConfig.kt b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetConfig.kt
new file mode 100644
index 00000000000..ad0b5c0b526
--- /dev/null
+++ b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetConfig.kt
@@ -0,0 +1,5 @@
+package app.k9mail.feature.widget.unread
+
+interface UnreadWidgetConfig {
+    val providerClass: Class<out BaseUnreadWidgetProvider>
+}
diff --git a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetUpdater.kt b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetUpdater.kt
index a3188fc3ce7..ae9356ce379 100644
--- a/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetUpdater.kt
+++ b/feature/widget/unread/src/main/kotlin/app/k9mail/feature/widget/unread/UnreadWidgetUpdater.kt
@@ -7,12 +7,12 @@ import android.content.Intent
 
 class UnreadWidgetUpdater(
     private val context: Context,
-    private val classProvider: UnreadWidgetClassProvider,
+    private val config: UnreadWidgetConfig,
 ) {
     private val appWidgetManager = AppWidgetManager.getInstance(context)
 
     fun updateAll() {
-        val thisWidget = ComponentName(context, classProvider.getUnreadWidgetClass())
+        val thisWidget = ComponentName(context, config.providerClass)
         val widgetIds = appWidgetManager.getAppWidgetIds(thisWidget)
 
         updateWidgets(context, widgetIds)
@@ -23,7 +23,7 @@ class UnreadWidgetUpdater(
     }
 
     private fun updateWidgets(context: Context, widgetIds: IntArray) {
-        val updateIntent = Intent(context, classProvider.getUnreadWidgetClass())
+        val updateIntent = Intent(context, config.providerClass)
         updateIntent.action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
         updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, widgetIds)
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2055cb0795c..a324f70be07 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -30,7 +30,6 @@ include(
     ":app:common",
     ":app:ui:base",
     ":app:ui:legacy",
-    ":app:ui:message-list-widget",
     ":app:core",
     ":app:storage",
     ":app:crypto-openpgp",
@@ -69,6 +68,7 @@ include(
 )
 
 include(
+    ":feature:widget:message-list",
     ":feature:widget:unread",
 )