diff --git a/app-k9mail/src/main/AndroidManifest.xml b/app-k9mail/src/main/AndroidManifest.xml
index 222feb98e98..9f2edb2176c 100644
--- a/app-k9mail/src/main/AndroidManifest.xml
+++ b/app-k9mail/src/main/AndroidManifest.xml
@@ -43,24 +43,6 @@
 
         </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/message_list_widget_label"
-            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 313f8522d3a..bd1541ecaf7 100644
--- a/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt
+++ b/app-k9mail/src/main/kotlin/app/k9mail/K9KoinModule.kt
@@ -20,7 +20,6 @@ import com.fsck.k9.activity.MessageCompose
 import com.fsck.k9.preferences.FilePrefixProvider
 import com.fsck.k9.provider.K9ThemeProvider
 import com.fsck.k9.provider.UnreadWidgetProvider
-import com.fsck.k9.widget.list.MessageListWidgetProvider
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.qualifier.named
 import org.koin.dsl.binds
@@ -49,6 +48,5 @@ val appConfig = AppConfig(
         MessageCompose::class.java,
         LauncherShortcutActivity::class.java,
         UnreadWidgetProvider::class.java,
-        MessageListWidgetProvider::class.java,
     ),
 )
diff --git a/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt b/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt
deleted file mode 100644
index f4538a16137..00000000000
--- a/app-k9mail/src/main/kotlin/app/k9mail/widget/K9MessageListWidgetConfig.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-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/KoinModule.kt b/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt
index 2c9ad58f9c1..a1aa0993208 100644
--- a/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt
+++ b/app-k9mail/src/main/kotlin/app/k9mail/widget/KoinModule.kt
@@ -1,10 +1,8 @@
 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
deleted file mode 100644
index 65449f42078..00000000000
--- a/app-k9mail/src/main/kotlin/com/fsck/k9/widget/list/MessageListWidgetProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-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/src/main/AndroidManifest.xml b/app-thunderbird/src/main/AndroidManifest.xml
index 780fcb614c6..67d75aebf10 100644
--- a/app-thunderbird/src/main/AndroidManifest.xml
+++ b/app-thunderbird/src/main/AndroidManifest.xml
@@ -42,24 +42,6 @@
 
         </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/message_list_widget_label"
-            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 88073416f25..8786226d293 100644
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/ThunderbirdKoinModule.kt
@@ -18,7 +18,6 @@ import net.thunderbird.android.provider.TbAppNameProvider
 import net.thunderbird.android.provider.TbFeatureThemeProvider
 import net.thunderbird.android.provider.TbThemeProvider
 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
@@ -48,6 +47,5 @@ val appConfig = AppConfig(
         MessageCompose::class.java,
         LauncherShortcutActivity::class.java,
         UnreadWidgetProvider::class.java,
-        MessageListWidgetProvider::class.java,
     ),
 )
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
index 0bfd96f4412..f036c7f85f9 100644
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/KoinModule.kt
+++ b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/KoinModule.kt
@@ -1,10 +1,8 @@
 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
deleted file mode 100644
index 7fad862bb96..00000000000
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/TbMessageListWidgetConfig.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-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/provider/MessageListWidgetProvider.kt b/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/provider/MessageListWidgetProvider.kt
deleted file mode 100644
index dedf1d18f3f..00000000000
--- a/app-thunderbird/src/main/kotlin/net/thunderbird/android/widget/provider/MessageListWidgetProvider.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-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/feature/widget/message-list/build.gradle.kts b/feature/widget/message-list/build.gradle.kts
index 8c6cc63a25c..4edd59fb827 100644
--- a/feature/widget/message-list/build.gradle.kts
+++ b/feature/widget/message-list/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     id(ThunderbirdPlugins.Library.android)
+    alias(libs.plugins.compose)
 }
 
 dependencies {
@@ -7,8 +8,13 @@ dependencies {
     implementation(projects.legacy.core)
 
     implementation(libs.timber)
+    implementation(libs.androidx.glance.appwidget)
+    implementation(libs.androidx.glance.material3)
 }
 
 android {
+    buildFeatures {
+        compose = true
+    }
     namespace = "app.k9mail.feature.widget.message.list"
 }
diff --git a/feature/widget/message-list/src/main/AndroidManifest.xml b/feature/widget/message-list/src/main/AndroidManifest.xml
index bdeddba3a32..749ee668b4f 100644
--- a/feature/widget/message-list/src/main/AndroidManifest.xml
+++ b/feature/widget/message-list/src/main/AndroidManifest.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-
-        <service
-            android:name=".MessageListWidgetService"
-            android:permission="android.permission.BIND_REMOTEVIEWS"
-            />
+        <receiver android:name="MyAppWidgetReceiver"
+            android:label="Message List"
+            android:exported="true">
+            <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>
 
     </application>
 </manifest>
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt
deleted file mode 100644
index a0c21398754..00000000000
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/BaseMessageListWidgetProvider.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-package app.k9mail.feature.widget.message.list
-
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.Context
-import android.content.Intent
-import android.widget.RemoteViews
-import androidx.core.app.PendingIntentCompat
-import app.k9mail.legacy.search.SearchAccount.Companion.createUnifiedInboxAccount
-import com.fsck.k9.CoreResourceProvider
-import com.fsck.k9.activity.MessageCompose
-import com.fsck.k9.activity.MessageList
-import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-abstract class BaseMessageListWidgetProvider : AppWidgetProvider(), KoinComponent {
-    private val messageListWidgetManager: MessageListWidgetManager by inject()
-    private val coreResourceProvider: CoreResourceProvider by inject()
-
-    override fun onEnabled(context: Context) {
-        messageListWidgetManager.onWidgetAdded()
-    }
-
-    override fun onDisabled(context: Context) {
-        messageListWidgetManager.onWidgetRemoved()
-    }
-
-    override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
-        for (appWidgetId in appWidgetIds) {
-            updateAppWidget(context, appWidgetManager, appWidgetId)
-        }
-    }
-
-    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(R.string.message_list_widget_inbox_title))
-
-        val intent = Intent(context, MessageListWidgetService::class.java)
-        views.setRemoteAdapter(R.id.listView, intent)
-
-        val viewAction = viewActionTemplatePendingIntent(context)
-        views.setPendingIntentTemplate(R.id.listView, viewAction)
-
-        val composeAction = composeActionPendingIntent(context)
-        views.setOnClickPendingIntent(R.id.new_message, composeAction)
-
-        val headerClickAction = viewUnifiedInboxPendingIntent(context)
-        views.setOnClickPendingIntent(R.id.top_controls, headerClickAction)
-
-        appWidgetManager.updateAppWidget(appWidgetId, views)
-    }
-
-    private fun viewActionTemplatePendingIntent(context: Context): PendingIntent {
-        val intent = MessageList.actionDisplayMessageTemplateIntent(
-            context,
-            openInUnifiedInbox = true,
-            messageViewOnly = true,
-        )
-        return PendingIntentCompat.getActivity(context, 1, intent, PendingIntent.FLAG_UPDATE_CURRENT, true)!!
-    }
-
-    private fun viewUnifiedInboxPendingIntent(context: Context): PendingIntent {
-        val unifiedInboxAccount = createUnifiedInboxAccount(
-            unifiedInboxTitle = coreResourceProvider.searchUnifiedInboxTitle(),
-            unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),
-        )
-        val intent = intentDisplaySearch(
-            context = context,
-            search = unifiedInboxAccount.relatedSearch,
-            noThreading = true,
-            newTask = true,
-            clearTop = true,
-        )
-        return PendingIntentCompat.getActivity(context, -1, intent, PendingIntent.FLAG_UPDATE_CURRENT, false)!!
-    }
-
-    private fun composeActionPendingIntent(context: Context): PendingIntent {
-        val intent = Intent(context, MessageCompose::class.java).apply {
-            action = MessageCompose.ACTION_COMPOSE
-        }
-        return PendingIntentCompat.getActivity(context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT, false)!!
-    }
-}
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
index d70caa03713..9197a011946 100644
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/KoinModule.kt
@@ -3,6 +3,5 @@ package app.k9mail.feature.widget.message.list
 import org.koin.dsl.module
 
 val messageListWidgetModule = module {
-    single { MessageListWidgetManager(context = get(), messageListRepository = get(), config = get()) }
     factory { MessageListLoader(preferences = get(), messageListRepository = get(), messageHelper = get()) }
 }
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/ListWidgetReciever.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/ListWidgetReciever.kt
new file mode 100644
index 00000000000..eb7206bb972
--- /dev/null
+++ b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/ListWidgetReciever.kt
@@ -0,0 +1,212 @@
+package app.k9mail.feature.widget.message.list
+
+import android.app.PendingIntent
+import android.content.Context
+import android.content.Intent
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.core.app.PendingIntentCompat
+import androidx.glance.ColorFilter
+import androidx.glance.GlanceId
+import androidx.glance.GlanceModifier
+import androidx.glance.GlanceTheme
+import androidx.glance.Image
+import androidx.glance.ImageProvider
+import androidx.glance.LocalContext
+import androidx.glance.action.clickable
+import androidx.glance.appwidget.GlanceAppWidget
+import androidx.glance.appwidget.GlanceAppWidgetReceiver
+import androidx.glance.appwidget.cornerRadius
+import androidx.glance.appwidget.lazy.LazyColumn
+import androidx.glance.appwidget.lazy.items
+import androidx.glance.appwidget.provideContent
+import androidx.glance.background
+import androidx.glance.layout.Alignment
+import androidx.glance.layout.Box
+import androidx.glance.layout.Column
+import androidx.glance.layout.Row
+import androidx.glance.layout.Spacer
+import androidx.glance.layout.fillMaxSize
+import androidx.glance.layout.fillMaxWidth
+import androidx.glance.layout.height
+import androidx.glance.layout.padding
+import androidx.glance.layout.width
+import androidx.glance.layout.wrapContentHeight
+import androidx.glance.text.Text
+import androidx.glance.text.TextStyle
+import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons
+import app.k9mail.legacy.account.Account.SortType
+import app.k9mail.legacy.search.SearchAccount.Companion.createUnifiedInboxAccount
+import com.fsck.k9.CoreResourceProvider
+import com.fsck.k9.K9
+import com.fsck.k9.activity.MessageCompose
+import com.fsck.k9.activity.MessageList
+import com.fsck.k9.activity.MessageList.Companion.intentDisplaySearch
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+
+class MyAppWidgetReceiver : GlanceAppWidgetReceiver() {
+    override val glanceAppWidget: GlanceAppWidget = MyAppWidget()
+}
+
+class MyAppWidget : GlanceAppWidget(), KoinComponent {
+
+    private val messageListLoader: MessageListLoader by inject()
+    private val coreResourceProvider: CoreResourceProvider by inject()
+
+    override suspend fun provideGlance(context: Context, id: GlanceId) {
+        // In this method, load data needed to render the AppWidget.
+        // Use `withContext` to switch to another thread for long running
+        // operations.
+        provideContent {
+            var mails by remember { mutableStateOf(emptyList<MessageListItem>()) }
+
+            LaunchedEffect(Unit) {
+                val unifiedInboxSearch = createUnifiedInboxAccount(
+                    unifiedInboxTitle = coreResourceProvider.searchUnifiedInboxTitle(),
+                    unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),
+                ).relatedSearch
+                val messageListConfig = MessageListConfig(
+                    search = unifiedInboxSearch,
+                    showingThreadedList = K9.isThreadedViewEnabled,
+                    sortType = SortType.SORT_DATE,
+                    sortAscending = false,
+                    sortDateAscending = false,
+                )
+                val list = messageListLoader.getMessageList(messageListConfig)
+                mails = list.subList(0, list.size.coerceAtMost(100))
+            }
+
+            GlanceTheme(GlanceTheme.colors) {
+                Column(GlanceModifier.fillMaxSize().background(GlanceTheme.colors.surface)) {
+                    Row(
+                        GlanceModifier.padding(horizontal = 8.dp, vertical = 12.dp).fillMaxWidth()
+                            .background(GlanceTheme.colors.primaryContainer)
+                            .clickable {
+                                val unifiedInboxAccount = createUnifiedInboxAccount(
+                                    unifiedInboxTitle = coreResourceProvider.searchUnifiedInboxTitle(),
+                                    unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),
+                                )
+                                val intent = intentDisplaySearch(
+                                    context = context,
+                                    search = unifiedInboxAccount.relatedSearch,
+                                    noThreading = true,
+                                    newTask = true,
+                                    clearTop = true,
+                                )
+                                PendingIntentCompat.getActivity(
+                                    context,
+                                    -1,
+                                    intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT,
+                                    false,
+                                )!!.send()
+                            },
+                    ) {
+                        Text("Unified Inbox", style = TextStyle(color = GlanceTheme.colors.primary, fontSize = 20.sp))
+                        Spacer(GlanceModifier.defaultWeight())
+                        Image(
+                            ImageProvider(Icons.Outlined.Edit),
+                            context.getString(R.string.message_list_widget_compose_action),
+                            GlanceModifier.padding(2.dp).padding(end = 6.dp).clickable {
+                                val intent = Intent(context, MessageCompose::class.java).apply {
+                                    action = MessageCompose.ACTION_COMPOSE
+                                }
+                                PendingIntentCompat.getActivity(
+                                    context,
+                                    0,
+                                    intent,
+                                    PendingIntent.FLAG_UPDATE_CURRENT,
+                                    false,
+                                )!!.send()
+                            },
+                            colorFilter = ColorFilter.tint(GlanceTheme.colors.primary),
+                        )
+                    }
+                    LazyColumn(GlanceModifier.fillMaxSize()) {
+                        items(mails) {
+                            Column {
+                                ListItem(it)
+                                Spacer(
+                                    GlanceModifier.height(2.dp).fillMaxWidth()
+                                        .background(GlanceTheme.colors.surfaceVariant),
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun ListItem(item: MessageListItem) {
+    val context = LocalContext.current
+    println("item: $item")
+    Row(
+        GlanceModifier.fillMaxWidth().wrapContentHeight().clickable {
+            CoroutineScope(Dispatchers.IO).launch {
+                try {
+                    val intent = MessageList.actionDisplayMessageIntent(context, item.messageReference)
+                    PendingIntentCompat.getActivity(context, -2, intent, PendingIntent.FLAG_UPDATE_CURRENT, false)!!
+                        .send()
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
+            }
+        },
+    ) {
+        Spacer(GlanceModifier.width(8.dp).background(Color(item.accountColor)))
+        Column(GlanceModifier.fillMaxWidth().padding(vertical = 4.dp, horizontal = 4.dp)) {
+            Row(GlanceModifier.fillMaxWidth()) {
+                Row(GlanceModifier.defaultWeight(), horizontalAlignment = Alignment.Start) {
+                    Text(
+                        item.subject,
+                        style = TextStyle(color = GlanceTheme.colors.primary, fontSize = 16.sp),
+                        maxLines = 1,
+                    )
+                }
+                Spacer(GlanceModifier.width(4.dp))
+                Row(horizontalAlignment = Alignment.End) {
+                    Box(
+                        GlanceModifier.background(GlanceTheme.colors.primaryContainer).cornerRadius(8.dp).padding(2.dp),
+                    ) {
+                        Text(
+                            item.threadCount.toString(),
+                            style = TextStyle(color = GlanceTheme.colors.primary, fontSize = 13.sp),
+                        )
+                    }
+                    Spacer(GlanceModifier.width(4.dp))
+                    Text(item.displayDate, style = TextStyle(color = GlanceTheme.colors.primary))
+                }
+            }
+            Spacer(GlanceModifier.height(2.dp))
+            Row {
+                Text(
+                    item.displayName,
+                    style = TextStyle(color = GlanceTheme.colors.primary, fontSize = 15.sp),
+                    maxLines = 1,
+                )
+            }
+            Spacer(GlanceModifier.height(2.dp))
+            Row {
+                Text(
+                    item.preview,
+                    style = TextStyle(color = GlanceTheme.colors.primary, fontSize = 13.sp),
+                    maxLines = 1,
+                )
+            }
+        }
+    }
+}
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt
deleted file mode 100644
index 90c6f38e3ce..00000000000
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListRemoteViewFactory.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-package app.k9mail.feature.widget.message.list
-
-import android.content.Context
-import android.graphics.Typeface
-import android.text.SpannableString
-import android.text.style.StyleSpan
-import android.view.View
-import android.widget.RemoteViews
-import android.widget.RemoteViewsService.RemoteViewsFactory
-import androidx.core.content.ContextCompat
-import app.k9mail.legacy.account.Account.SortType
-import app.k9mail.legacy.search.LocalSearch
-import app.k9mail.legacy.search.SearchAccount
-import com.fsck.k9.CoreResourceProvider
-import com.fsck.k9.K9
-import com.fsck.k9.activity.MessageList
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-@Suppress("TooManyFunctions")
-internal class MessageListRemoteViewFactory(private val context: Context) : RemoteViewsFactory, KoinComponent {
-    private val messageListLoader: MessageListLoader by inject()
-    private val coreResourceProvider: CoreResourceProvider by inject()
-
-    private lateinit var unifiedInboxSearch: LocalSearch
-
-    private var messageListItems = emptyList<MessageListItem>()
-    private var senderAboveSubject = false
-    private var readTextColor = 0
-    private var unreadTextColor = 0
-
-    override fun onCreate() {
-        unifiedInboxSearch = SearchAccount.createUnifiedInboxAccount(
-            unifiedInboxTitle = coreResourceProvider.searchUnifiedInboxTitle(),
-            unifiedInboxDetail = coreResourceProvider.searchUnifiedInboxDetail(),
-        ).relatedSearch
-
-        senderAboveSubject = K9.isMessageListSenderAboveSubject
-        readTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_read)
-        unreadTextColor = ContextCompat.getColor(context, R.color.message_list_widget_text_unread)
-    }
-
-    override fun onDataSetChanged() {
-        loadMessageList()
-    }
-
-    private fun loadMessageList() {
-        // TODO: Use same sort order that is used for the Unified Inbox inside the app
-        val messageListConfig = MessageListConfig(
-            search = unifiedInboxSearch,
-            showingThreadedList = K9.isThreadedViewEnabled,
-            sortType = SortType.SORT_DATE,
-            sortAscending = false,
-            sortDateAscending = false,
-        )
-
-        messageListItems = messageListLoader.getMessageList(messageListConfig)
-    }
-
-    override fun onDestroy() = Unit
-
-    override fun getCount(): Int = messageListItems.size
-
-    override fun getViewAt(position: Int): RemoteViews {
-        val remoteView = RemoteViews(context.packageName, R.layout.message_list_widget_list_item)
-
-        val item = messageListItems[position]
-
-        val displayName = if (item.isRead) item.displayName else bold(item.displayName)
-        val subject = if (item.isRead) item.subject else bold(item.subject)
-
-        if (senderAboveSubject) {
-            remoteView.setTextViewText(R.id.sender, displayName)
-            remoteView.setTextViewText(R.id.mail_subject, subject)
-        } else {
-            remoteView.setTextViewText(R.id.sender, subject)
-            remoteView.setTextViewText(R.id.mail_subject, displayName)
-        }
-
-        remoteView.setTextViewText(R.id.mail_date, item.displayDate)
-        remoteView.setTextViewText(R.id.mail_preview, item.preview)
-
-        if (item.threadCount > 1) {
-            remoteView.setTextViewText(R.id.thread_count, item.threadCount.toString())
-            remoteView.setInt(R.id.thread_count, "setVisibility", View.VISIBLE)
-        } else {
-            remoteView.setInt(R.id.thread_count, "setVisibility", View.GONE)
-        }
-
-        val textColor = getTextColor(item)
-        remoteView.setTextColor(R.id.sender, textColor)
-        remoteView.setTextColor(R.id.mail_subject, textColor)
-        remoteView.setTextColor(R.id.mail_date, textColor)
-        remoteView.setTextColor(R.id.mail_preview, textColor)
-
-        if (item.hasAttachments) {
-            remoteView.setInt(R.id.attachment, "setVisibility", View.VISIBLE)
-        } else {
-            remoteView.setInt(R.id.attachment, "setVisibility", View.GONE)
-        }
-
-        val intent = MessageList.actionDisplayMessageTemplateFillIntent(item.messageReference)
-        remoteView.setOnClickFillInIntent(R.id.mail_list_item, intent)
-
-        remoteView.setInt(R.id.chip, "setBackgroundColor", item.accountColor)
-
-        return remoteView
-    }
-
-    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(R.string.message_list_widget_list_item_loading))
-        }
-    }
-
-    override fun getViewTypeCount(): Int = 2
-
-    override fun getItemId(position: Int): Long = messageListItems[position].uniqueId
-
-    override fun hasStableIds(): Boolean = true
-
-    private fun bold(text: String): CharSequence {
-        return SpannableString(text).apply {
-            setSpan(StyleSpan(Typeface.BOLD), 0, text.length, 0)
-        }
-    }
-
-    private fun getTextColor(messageListItem: MessageListItem): Int {
-        return if (messageListItem.isRead) readTextColor else unreadTextColor
-    }
-}
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
deleted file mode 100644
index 8311472344d..00000000000
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetConfig.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package app.k9mail.feature.widget.message.list
-
-interface MessageListWidgetConfig {
-    val providerClass: Class<out BaseMessageListWidgetProvider>
-}
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt
deleted file mode 100644
index 297c25601d4..00000000000
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetManager.kt
+++ /dev/null
@@ -1,110 +0,0 @@
-package app.k9mail.feature.widget.message.list
-
-import android.appwidget.AppWidgetManager
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import app.k9mail.legacy.mailstore.MessageListChangedListener
-import app.k9mail.legacy.mailstore.MessageListRepository
-import com.fsck.k9.core.BuildConfig
-import timber.log.Timber
-
-class MessageListWidgetManager(
-    private val context: Context,
-    private val messageListRepository: MessageListRepository,
-    private val config: MessageListWidgetConfig,
-) {
-    private var appWidgetManager: AppWidgetManager? = null
-
-    private var listenerAdded = false
-    private val listener = MessageListChangedListener {
-        onMessageListChanged()
-    }
-
-    fun init() {
-        appWidgetManager = AppWidgetManager.getInstance(context)
-        if (appWidgetManager == null) {
-            Timber.v("Message list widget is not supported on this device.")
-        }
-
-        if (isAtLeastOneMessageListWidgetAdded()) {
-            resetMessageListWidget()
-            registerMessageListChangedListener()
-        }
-    }
-
-    @Suppress("TooGenericExceptionCaught")
-    private fun onMessageListChanged() {
-        try {
-            triggerMessageListWidgetUpdate()
-        } catch (e: RuntimeException) {
-            if (BuildConfig.DEBUG) {
-                throw e
-            } else {
-                Timber.e(e, "Error while updating message list widget")
-            }
-        }
-    }
-
-    internal fun onWidgetAdded() {
-        Timber.v("Message list widget added")
-
-        registerMessageListChangedListener()
-    }
-
-    internal fun onWidgetRemoved() {
-        Timber.v("Message list widget removed")
-
-        if (!isAtLeastOneMessageListWidgetAdded()) {
-            unregisterMessageListChangedListener()
-        }
-    }
-
-    @Synchronized
-    private fun registerMessageListChangedListener() {
-        if (!listenerAdded) {
-            listenerAdded = true
-            messageListRepository.addListener(listener)
-
-            Timber.v("Message list widget is now listening for message list changes…")
-        }
-    }
-
-    @Synchronized
-    private fun unregisterMessageListChangedListener() {
-        if (listenerAdded) {
-            listenerAdded = false
-            messageListRepository.removeListener(listener)
-
-            Timber.v("Message list widget stopped listening for message list changes.")
-        }
-    }
-
-    private fun isAtLeastOneMessageListWidgetAdded(): Boolean {
-        return getAppWidgetIds().isNotEmpty()
-    }
-
-    private fun triggerMessageListWidgetUpdate() {
-        val appWidgetIds = getAppWidgetIds()
-        if (appWidgetIds.isNotEmpty()) {
-            appWidgetManager?.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.listView)
-        }
-    }
-
-    private fun resetMessageListWidget() {
-        val appWidgetIds = getAppWidgetIds()
-        if (appWidgetIds.isNotEmpty()) {
-            val intent = Intent(context, config.providerClass).apply {
-                action = AppWidgetManager.ACTION_APPWIDGET_UPDATE
-                putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
-            }
-
-            context.sendBroadcast(intent)
-        }
-    }
-
-    private fun getAppWidgetIds(): IntArray {
-        val componentName = ComponentName(context, config.providerClass)
-        return appWidgetManager?.getAppWidgetIds(componentName) ?: intArrayOf()
-    }
-}
diff --git a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt b/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt
deleted file mode 100644
index 2d0de868ba9..00000000000
--- a/feature/widget/message-list/src/main/kotlin/app/k9mail/feature/widget/message/list/MessageListWidgetService.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.k9mail.feature.widget.message.list
-
-import android.content.Intent
-import android.widget.RemoteViewsService
-
-class MessageListWidgetService : RemoteViewsService() {
-    override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
-        return MessageListRemoteViewFactory(applicationContext)
-    }
-}
diff --git a/feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml
deleted file mode 100644
index a3717800cd9..00000000000
--- a/feature/widget/message-list/src/main/res/layout/message_list_widget_layout.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <LinearLayout
-        android:id="@+id/top_controls"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/message_list_widget_header_background"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        >
-
-        <TextView
-            android:id="@+id/folder"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:paddingBottom="12dp"
-            android:paddingLeft="8dp"
-            android:paddingRight="8dp"
-            android:paddingTop="12dp"
-            android:textSize="20sp"
-            android:textColor="@color/message_list_widget_header_text"
-            tools:text="Unified Inbox"
-            />
-
-        <ImageButton
-            android:id="@+id/new_message"
-            android:layout_width="56dp"
-            android:layout_height="match_parent"
-            android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/message_list_widget_compose_action"
-            android:scaleType="center"
-            android:src="@drawable/ic_edit"
-            />
-
-    </LinearLayout>
-
-    <ListView
-        android:id="@+id/listView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white"
-        android:divider="@color/message_list_widget_divider"
-        android:dividerHeight="0.5dp"
-        />
-
-</LinearLayout>
diff --git a/feature/widget/message-list/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
deleted file mode 100644
index d4fd592a1f5..00000000000
--- a/feature/widget/message-list/src/main/res/layout/message_list_widget_list_item.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/mail_list_item"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="#fff"
-    >
-
-    <!-- A regular View breaks things for some reason, but a TextView does the job -->
-    <TextView
-        android:id="@+id/chip"
-        android:layout_width="8dip"
-        android:layout_height="match_parent"
-        tools:background="#0099CC"
-        android:visibility="visible"
-        />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:padding="@dimen/widget_padding"
-        >
-
-        <TextView
-            android:id="@+id/mail_date"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentEnd="true"
-            android:layout_marginStart="4dp"
-            tools:text="25 May"
-            />
-
-        <ImageView
-            android:id="@+id/attachment"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@+id/mail_date"
-            android:layout_centerInParent="true"
-            android:layout_marginStart="4dp"
-            android:layout_toStartOf="@+id/mail_date"
-            android:src="@drawable/ic_attachment"
-            android:visibility="gone"
-            tools:visibility="visible"
-            />
-
-        <TextView
-            android:id="@+id/thread_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_toStartOf="@id/attachment"
-            android:layout_marginStart="4dp"
-            android:maxLines="1"
-            android:paddingRight="4dip"
-            android:paddingBottom="1dip"
-            android:paddingLeft="4dip"
-            android:textSize="16sp"
-            android:textColor="?android:attr/colorBackground"
-            android:background="@drawable/thread_count_box_light"
-            tools:text="3"
-            />
-
-        <TextView
-            android:id="@+id/sender"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_gravity="start"
-            android:layout_toStartOf="@id/thread_count"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="16sp"
-            tools:text="Kinda long subject that should be long enough to exceed the available display space"
-            />
-
-        <TextView
-            android:id="@+id/mail_subject"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/sender"
-            android:layout_alignParentStart="true"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingBottom="2dp"
-            android:textSize="15sp"
-            tools:text="Wikipedia"
-            />
-
-        <TextView
-            android:id="@+id/mail_preview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/mail_subject"
-            android:layout_alignParentStart="true"
-            android:maxLines="1"
-            android:textSize="13sp"
-            tools:text="Towel Day is celebrated every year on 25 May as a tribute to the author Douglas Adams by his fans."
-            />
-
-    </RelativeLayout>
-</LinearLayout>
diff --git a/feature/widget/message-list/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
deleted file mode 100644
index 3b182db2a34..00000000000
--- a/feature/widget/message-list/src/main/res/layout/message_list_widget_list_item_loading.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/loadingText"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:ellipsize="end"
-    android:gravity="center"
-    android:maxLines="1"
-    android:padding="16dp"
-    android:textSize="15sp"
-    tools:text="@string/message_list_widget_list_item_loading"
-    />
diff --git a/feature/widget/message-list/src/main/res/layout/message_list_widget_loading.xml b/feature/widget/message-list/src/main/res/layout/message_list_widget_loading.xml
deleted file mode 100644
index d68930ff82c..00000000000
--- a/feature/widget/message-list/src/main/res/layout/message_list_widget_loading.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@android:color/white"
-    android:gravity="center"
-    android:padding="16dp"
-    android:text="@string/message_list_widget_initializing"
-    android:textSize="18sp"
-    />
diff --git a/feature/widget/message-list/src/main/res/values/colors.xml b/feature/widget/message-list/src/main/res/values/colors.xml
deleted file mode 100644
index 2b2baf649ae..00000000000
--- a/feature/widget/message-list/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="message_list_widget_header_background">#737373</color>
-    <color name="message_list_widget_header_text">#e4e4e4</color>
-    <color name="message_list_widget_divider">#e5e5e5</color>
-    <color name="message_list_widget_text_read">#444444</color>
-    <color name="message_list_widget_text_unread">#000000</color>
-</resources>
diff --git a/feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml b/feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml
index b0716664450..b74cc928697 100644
--- a/feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml
+++ b/feature/widget/message-list/src/main/res/xml/message_list_widget_info.xml
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialKeyguardLayout="@layout/message_list_widget_loading"
-    android:initialLayout="@layout/message_list_widget_loading"
+<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    android:initialLayout="@layout/glance_default_loading_layout"
     android:minHeight="180dp"
     android:minWidth="250dp"
     android:minResizeWidth="110dp"
@@ -11,4 +8,5 @@
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="86400000"
     android:widgetCategory="home_screen|keyguard"
-    />
+    >
+</appwidget-provider>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index fe16f2a6e50..4b2cdd57d6e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,6 +55,7 @@ detektPlugin = "1.23.5"
 detektPluginCompose = "0.4.18"
 fastAdapter = "5.7.0"
 forkhandlesBom = "2.20.0.0"
+glanceMaterial3 = "1.1.1"
 glide = "4.16.0"
 gradle = "8.11.1"
 http4kBom = "5.35.2.0"
@@ -99,6 +100,7 @@ tokenautocomplete = "4.0.0-beta01-k9mail02"
 turbine = "1.2.0"
 xmlpull = "1.0"
 zxing = "3.5.3"
+glanceAppwidget = "1.1.1"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }
@@ -150,6 +152,7 @@ androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", versi
 androidx-fragment = { module = "androidx.fragment:fragment", version.ref = "androidxFragment" }
 androidx-fragment-compose = { module = "androidx.fragment:fragment-compose", version.ref = "androidxFragment" }
 androidx-fragment-testing = { module = "androidx.fragment:fragment-testing", version.ref = "androidxFragment" }
+androidx-glance-material3 = { module = "androidx.glance:glance-material3", version.ref = "glanceMaterial3" }
 androidx-lifecycle-common = { module = "androidx.lifecycle:lifecycle-common", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "androidxLifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "androidxLifecycle" }
@@ -245,6 +248,7 @@ tokenautocomplete = { module = "de.cketti.temp:tokenautocomplete", version.ref =
 turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 xmlpull = { module = "com.github.cketti:xmlpull-extracted-from-android", version.ref = "xmlpull" }
 zxing = { module = "com.google.zxing:core", version.ref = "zxing" }
+androidx-glance-appwidget = { group = "androidx.glance", name = "glance-appwidget", version.ref = "glanceAppwidget" }
 
 [bundles]
 shared-jvm-main = [
diff --git a/legacy/common/src/main/java/com/fsck/k9/CommonApp.kt b/legacy/common/src/main/java/com/fsck/k9/CommonApp.kt
index 28d7a305e3b..3cee542c2af 100644
--- a/legacy/common/src/main/java/com/fsck/k9/CommonApp.kt
+++ b/legacy/common/src/main/java/com/fsck/k9/CommonApp.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import android.content.Context
 import android.content.res.Configuration
 import android.content.res.Resources
-import app.k9mail.feature.widget.message.list.MessageListWidgetManager
 import app.k9mail.legacy.di.DI
 import app.k9mail.legacy.ui.theme.ThemeManager
 import com.fsck.k9.controller.MessagingController
@@ -30,7 +29,6 @@ abstract class CommonApp : Application(), WorkManagerConfiguration.Provider {
     private val themeManager: ThemeManager by inject()
     private val appLanguageManager: AppLanguageManager by inject()
     private val notificationChannelManager: NotificationChannelManager by inject()
-    private val messageListWidgetManager: MessageListWidgetManager by inject()
     private val workManagerConfigurationProvider: WorkManagerConfigurationProvider by inject()
 
     private val appCoroutineScope: CoroutineScope = MainScope()
@@ -52,7 +50,6 @@ abstract class CommonApp : Application(), WorkManagerConfiguration.Provider {
         initializeAppLanguage()
         updateNotificationChannelsOnAppLanguageChanges()
         themeManager.init()
-        messageListWidgetManager.init()
 
         messagingListenerProvider.listeners.forEach { listener ->
             messagingController.addListener(listener)