From 7096d9ca3899df758bb5deeb783e9c9c4afebdbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolf-Martell=20Montw=C3=A9?= <wolf@thunderbird.net>
Date: Fri, 20 Sep 2024 12:33:12 +0200
Subject: [PATCH] Add RemoteImage using landscapist and coil

(cherry picked from commit 4fd3416b590cc81c5456931a0e24688398281d9f)
---
 .../fossReleaseRuntimeClasspath.txt           | 39 +++++++++++++++++--
 .../fullReleaseRuntimeClasspath.txt           | 39 +++++++++++++++++--
 .../dependencies/fossBetaRuntimeClasspath.txt | 39 +++++++++++++++++--
 .../fossDailyRuntimeClasspath.txt             | 39 +++++++++++++++++--
 .../fossReleaseRuntimeClasspath.txt           | 39 +++++++++++++++++--
 .../dependencies/fullBetaRuntimeClasspath.txt | 39 +++++++++++++++++--
 .../fullDailyRuntimeClasspath.txt             | 39 +++++++++++++++++--
 .../fullReleaseRuntimeClasspath.txt           | 39 +++++++++++++++++--
 app-ui-catalog/src/main/AndroidManifest.xml   |  2 +
 .../ui/catalog/ui/atom/items/ImageItems.kt    | 33 ++++++++++++++++
 core/ui/compose/designsystem/build.gradle.kts |  8 ++++
 .../atom/image/RemoteImagePreview.kt          | 23 +++++++++++
 .../designsystem/atom/image/RemoteImage.kt    | 37 ++++++++++++++++++
 gradle/libs.versions.toml                     |  2 +
 14 files changed, 393 insertions(+), 24 deletions(-)
 create mode 100644 core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImagePreview.kt
 create mode 100644 core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImage.kt

diff --git a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
index 512a1516e6f..cf044424219 100644
--- a/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fossReleaseRuntimeClasspath.txt
@@ -66,7 +66,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -105,7 +105,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -140,6 +140,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.flexbox:flexbox:3.0.0
 com.google.android.material:material:1.12.0
 com.google.errorprone:error_prone_annotations:2.15.0
@@ -165,6 +169,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -181,7 +193,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -189,6 +220,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
index 572e5d38399..72799ec59b8 100644
--- a/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-k9mail/dependencies/fullReleaseRuntimeClasspath.txt
@@ -66,7 +66,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -105,7 +105,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -142,6 +142,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.datatransport:transport-api:3.0.0
 com.google.android.datatransport:transport-backend-cct:3.1.8
 com.google.android.datatransport:transport-runtime:3.1.8
@@ -178,6 +182,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -195,7 +207,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -203,6 +234,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
index 816bc19ea12..a7abe26fd03 100644
--- a/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossBetaRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -145,6 +145,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.flexbox:flexbox:3.0.0
 com.google.android.material:material:1.12.0
 com.google.auto.value:auto-value-annotations:1.6.3
@@ -172,6 +176,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -188,7 +200,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -196,6 +227,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
index 816bc19ea12..a7abe26fd03 100644
--- a/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossDailyRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -145,6 +145,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.flexbox:flexbox:3.0.0
 com.google.android.material:material:1.12.0
 com.google.auto.value:auto-value-annotations:1.6.3
@@ -172,6 +176,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -188,7 +200,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -196,6 +227,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
index 816bc19ea12..a7abe26fd03 100644
--- a/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fossReleaseRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -145,6 +145,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.flexbox:flexbox:3.0.0
 com.google.android.material:material:1.12.0
 com.google.auto.value:auto-value-annotations:1.6.3
@@ -172,6 +176,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -188,7 +200,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -196,6 +227,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
index cd99d4bfc65..2d2d161db30 100644
--- a/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullBetaRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -147,6 +147,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.datatransport:transport-api:3.0.0
 com.google.android.datatransport:transport-backend-cct:3.1.8
 com.google.android.datatransport:transport-runtime:3.1.8
@@ -185,6 +189,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -202,7 +214,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -210,6 +241,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
index cd99d4bfc65..2d2d161db30 100644
--- a/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullDailyRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -147,6 +147,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.datatransport:transport-api:3.0.0
 com.google.android.datatransport:transport-backend-cct:3.1.8
 com.google.android.datatransport:transport-runtime:3.1.8
@@ -185,6 +189,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -202,7 +214,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -210,6 +241,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
index cd99d4bfc65..2d2d161db30 100644
--- a/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
+++ b/app-thunderbird/dependencies/fullReleaseRuntimeClasspath.txt
@@ -71,7 +71,7 @@ androidx.drawerlayout:drawerlayout:1.1.1
 androidx.dynamicanimation:dynamicanimation:1.0.0
 androidx.emoji2:emoji2-views-helper:1.3.0
 androidx.emoji2:emoji2:1.3.0
-androidx.exifinterface:exifinterface:1.3.6
+androidx.exifinterface:exifinterface:1.3.7
 androidx.fragment:fragment-compose:1.8.5
 androidx.fragment:fragment-ktx:1.8.5
 androidx.fragment:fragment:1.8.5
@@ -110,7 +110,7 @@ androidx.navigation:navigation-runtime:2.8.4
 androidx.navigation:navigation-ui:2.8.4
 androidx.preference:preference:1.2.1
 androidx.print:print:1.0.0
-androidx.profileinstaller:profileinstaller:1.4.0
+androidx.profileinstaller:profileinstaller:1.4.1
 androidx.recyclerview:recyclerview:1.3.2
 androidx.resourceinspection:resourceinspection-annotation:1.0.1
 androidx.room:room-common:2.6.1
@@ -147,6 +147,10 @@ com.github.bumptech.glide:annotations:4.16.0
 com.github.bumptech.glide:disklrucache:4.16.0
 com.github.bumptech.glide:gifdecoder:4.16.0
 com.github.bumptech.glide:glide:4.16.0
+com.github.skydoves:landscapist-android:2.4.4
+com.github.skydoves:landscapist-coil3-android:2.4.4
+com.github.skydoves:landscapist-coil3:2.4.4
+com.github.skydoves:landscapist:2.4.4
 com.google.android.datatransport:transport-api:3.0.0
 com.google.android.datatransport:transport-backend-cct:3.1.8
 com.google.android.datatransport:transport-runtime:3.1.8
@@ -185,6 +189,14 @@ de.cketti.library.changelog:ckchangelog-core:2.0.0-beta02
 de.cketti.safecontentresolver:safe-content-resolver-v21:1.0.0
 de.cketti.temp:tokenautocomplete:4.0.0-beta01-k9mail02
 de.hdodenhof:circleimageview:3.1.0
+io.coil-kt.coil3:coil-android:3.0.4
+io.coil-kt.coil3:coil-core-android:3.0.4
+io.coil-kt.coil3:coil-core:3.0.4
+io.coil-kt.coil3:coil-network-core-android:3.0.4
+io.coil-kt.coil3:coil-network-core:3.0.4
+io.coil-kt.coil3:coil-network-okhttp-jvm:3.0.4
+io.coil-kt.coil3:coil-network-okhttp:3.0.4
+io.coil-kt.coil3:coil:3.0.4
 io.insert-koin:koin-android:3.5.6
 io.insert-koin:koin-androidx-compose:3.5.6
 io.insert-koin:koin-bom:3.5.6
@@ -202,7 +214,26 @@ org.apache.httpcomponents.core5:httpcore5-h2:5.3.1
 org.apache.httpcomponents.core5:httpcore5:5.3.1
 org.apache.james:apache-mime4j-core:0.8.9
 org.apache.james:apache-mime4j-dom:0.8.9
-org.jetbrains.compose.runtime:runtime:1.5.12
+org.jetbrains.androidx.lifecycle:lifecycle-common:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime-compose:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-runtime:2.8.4
+org.jetbrains.androidx.lifecycle:lifecycle-viewmodel:2.8.4
+org.jetbrains.compose.animation:animation-core:1.7.1
+org.jetbrains.compose.animation:animation:1.7.1
+org.jetbrains.compose.annotation-internal:annotation:1.7.1
+org.jetbrains.compose.collection-internal:collection:1.7.1
+org.jetbrains.compose.components:components-resources-android:1.7.1
+org.jetbrains.compose.components:components-resources:1.7.1
+org.jetbrains.compose.foundation:foundation-layout:1.7.1
+org.jetbrains.compose.foundation:foundation:1.7.1
+org.jetbrains.compose.runtime:runtime-saveable:1.7.1
+org.jetbrains.compose.runtime:runtime:1.7.1
+org.jetbrains.compose.ui:ui-geometry:1.7.1
+org.jetbrains.compose.ui:ui-graphics:1.7.1
+org.jetbrains.compose.ui:ui-text:1.7.1
+org.jetbrains.compose.ui:ui-unit:1.7.1
+org.jetbrains.compose.ui:ui-util:1.7.1
+org.jetbrains.compose.ui:ui:1.7.1
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.0.21
 org.jetbrains.kotlin:kotlin-bom:2.0.21
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.0.21
@@ -210,6 +241,8 @@ org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21
+org.jetbrains.kotlinx:atomicfu-jvm:0.23.2
+org.jetbrains.kotlinx:atomicfu:0.23.2
 org.jetbrains.kotlinx:kotlinx-collections-immutable-jvm:0.3.8
 org.jetbrains.kotlinx:kotlinx-collections-immutable:0.3.8
 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0
diff --git a/app-ui-catalog/src/main/AndroidManifest.xml b/app-ui-catalog/src/main/AndroidManifest.xml
index a8179f1005a..7832a679236 100644
--- a/app-ui-catalog/src/main/AndroidManifest.xml
+++ b/app-ui-catalog/src/main/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".CatalogApplication"
         android:allowBackup="true"
diff --git a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ImageItems.kt b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ImageItems.kt
index e1bc1434bd6..1005891bd8c 100644
--- a/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ImageItems.kt
+++ b/app-ui-catalog/src/main/java/app/k9mail/ui/catalog/ui/atom/items/ImageItems.kt
@@ -6,6 +6,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.grid.LazyGridScope
 import androidx.compose.runtime.Composable
@@ -14,7 +15,10 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import app.k9mail.core.ui.compose.designsystem.atom.icon.Icon
+import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons
 import app.k9mail.core.ui.compose.designsystem.atom.image.FixedScaleImage
+import app.k9mail.core.ui.compose.designsystem.atom.image.RemoteImage
 import app.k9mail.core.ui.compose.designsystem.atom.text.TextBodySmall
 import app.k9mail.core.ui.compose.theme2.MainTheme
 import app.k9mail.ui.catalog.ui.common.list.defaultItem
@@ -37,6 +41,12 @@ fun LazyGridScope.imageItems() {
     fixedScaleImagesCropped()
     fixedScaleImagesOverflow()
     fixedScaleImagesAlignment()
+
+    sectionHeaderItem(text = "Remote images")
+    remoteImage(
+        url = "https://www.thunderbird.net/media/img/thunderbird/favicon-196.png",
+        description = "Weblink",
+    )
 }
 
 private fun LazyGridScope.fixedScaleImagesCropped() {
@@ -146,3 +156,26 @@ private fun FixedScaleImageView(
         TextBodySmall(text = description)
     }
 }
+
+private fun LazyGridScope.remoteImage(
+    url: String,
+    description: String,
+) {
+    fullSpanItem {
+        Column(
+            modifier = Modifier.padding(defaultItemPadding()),
+            horizontalAlignment = Alignment.CenterHorizontally,
+        ) {
+            RemoteImage(
+                url = url,
+                modifier = Modifier.size(MainTheme.sizes.large),
+                placeholder = {
+                    Icon(
+                        imageVector = Icons.Filled.Star,
+                    )
+                },
+            )
+            TextBodySmall(text = description)
+        }
+    }
+}
diff --git a/core/ui/compose/designsystem/build.gradle.kts b/core/ui/compose/designsystem/build.gradle.kts
index 40bd255446c..bd898ff81ce 100644
--- a/core/ui/compose/designsystem/build.gradle.kts
+++ b/core/ui/compose/designsystem/build.gradle.kts
@@ -16,5 +16,13 @@ dependencies {
     implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material.icons.extended)
 
+    // Landscapist imports a lot of dependencies that we don't need. We exclude them here.
+    implementation(libs.lanscapist.coil) {
+        exclude(group = "io.coil-kt", module = "coil-gif")
+        exclude(group = "io.coil-kt", module = "coil-video")
+        exclude(group = "io.coil-kt.coil3", module = "coil-network-ktor3")
+        exclude(group = "io.ktor")
+    }
+
     testImplementation(projects.core.ui.compose.testing)
 }
diff --git a/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImagePreview.kt b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImagePreview.kt
new file mode 100644
index 00000000000..1a8331f175f
--- /dev/null
+++ b/core/ui/compose/designsystem/src/debug/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImagePreview.kt
@@ -0,0 +1,23 @@
+package app.k9mail.core.ui.compose.designsystem.atom.image
+
+import androidx.compose.foundation.layout.size
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.vector.rememberVectorPainter
+import androidx.compose.ui.tooling.preview.Preview
+import app.k9mail.core.ui.compose.designsystem.PreviewWithTheme
+import app.k9mail.core.ui.compose.designsystem.atom.icon.Icons
+import app.k9mail.core.ui.compose.theme2.MainTheme
+
+@Composable
+@Preview(showBackground = true)
+fun RemoteImagePreview() {
+    PreviewWithTheme {
+        val painter = rememberVectorPainter(Icons.Outlined.AccountCircle)
+        RemoteImage(
+            url = "",
+            modifier = Modifier.size(MainTheme.sizes.large),
+            previewPlaceholder = painter,
+        )
+    }
+}
diff --git a/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImage.kt b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImage.kt
new file mode 100644
index 00000000000..03a96fa64a7
--- /dev/null
+++ b/core/ui/compose/designsystem/src/main/kotlin/app/k9mail/core/ui/compose/designsystem/atom/image/RemoteImage.kt
@@ -0,0 +1,37 @@
+package app.k9mail.core.ui.compose.designsystem.atom.image
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.layout.ContentScale
+import com.skydoves.landscapist.ImageOptions
+import com.skydoves.landscapist.coil3.CoilImage
+
+@Composable
+fun RemoteImage(
+    url: String,
+    modifier: Modifier = Modifier,
+    placeholder: @Composable (() -> Unit)? = null,
+    alignment: Alignment = Alignment.Center,
+    contentDescription: String? = null,
+    contentScale: ContentScale = ContentScale.Crop,
+    previewPlaceholder: Painter? = null,
+) {
+    CoilImage(
+        imageModel = { url },
+        imageOptions = ImageOptions(
+            alignment = alignment,
+            contentDescription = contentDescription,
+            contentScale = contentScale,
+        ),
+        failure = {
+            placeholder?.invoke()
+        },
+        loading = {
+            placeholder?.invoke()
+        },
+        modifier = modifier,
+        previewPlaceholder = previewPlaceholder,
+    )
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 542103ccb27..9f18a34658c 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -79,6 +79,7 @@ kotlinxDateTime = "0.6.1"
 kotlinxSerialization = "1.7.3"
 ktlint = "1.2.1"
 kxml2 = "1.0"
+landscapist = "2.4.4"
 leakcanary = "2.13"
 mime4j = "0.8.9"
 minidns = "1.0.5"
@@ -219,6 +220,7 @@ kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-t
 kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinxDateTime" }
 kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" }
 kxml2 = { module = "com.github.cketti:kxml2-extracted-from-android", version.ref = "kxml2" }
+lanscapist-coil = { module = "com.github.skydoves:landscapist-coil3", version.ref = "landscapist" }
 leakcanary-android = { module = "com.squareup.leakcanary:leakcanary-android", version.ref = "leakcanary" }
 mime4j-core = { module = "org.apache.james:apache-mime4j-core", version.ref = "mime4j" }
 mime4j-dom = { module = "org.apache.james:apache-mime4j-dom", version.ref = "mime4j" }