diff --git a/design-library/src/main/kotlin/app/dapk/st/design/components/Error.kt b/design-library/src/main/kotlin/app/dapk/st/design/components/Error.kt
index 20db56c..ef06b5f 100644
--- a/design-library/src/main/kotlin/app/dapk/st/design/components/Error.kt
+++ b/design-library/src/main/kotlin/app/dapk/st/design/components/Error.kt
@@ -14,7 +14,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun GenericError(message: String = "Something went wrong...", label: String = "Retry", moreDetails: String? = null, action: () -> Unit) {
+fun GenericError(message: String = "Something went wrong...", label: String = "Retry", cause: Throwable? = null, action: () -> Unit) {
+    val moreDetails = cause?.let { "${it::class.java.simpleName}: ${it.message}" }
+
     val openDetailsDialog = remember { mutableStateOf(false) }
     if (openDetailsDialog.value) {
         AlertDialog(
diff --git a/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryScreen.kt b/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryScreen.kt
index acb46c1..8770857 100644
--- a/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryScreen.kt
+++ b/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryScreen.kt
@@ -42,12 +42,10 @@ fun ImageGalleryScreen(viewModel: ImageGalleryViewModel, onTopLevelBack: () -> U
 
     Spider(currentPage = viewModel.state.page, onNavigate = onNavigate) {
         item(ImageGalleryPage.Routes.folders) {
-            ImageGalleryFolders(it) { folder ->
-                viewModel.selectFolder(folder)
-            }
+            ImageGalleryFolders(it, onClick = { viewModel.selectFolder(it) }, onRetry = { viewModel.start() })
         }
         item(ImageGalleryPage.Routes.files) {
-            ImageGalleryMedia(it, onImageSelected)
+            ImageGalleryMedia(it, onImageSelected, onRetry = { viewModel.selectFolder(it.folder) })
         }
     }
 
@@ -55,7 +53,7 @@ fun ImageGalleryScreen(viewModel: ImageGalleryViewModel, onTopLevelBack: () -> U
 
 
 @Composable
-fun ImageGalleryFolders(state: ImageGalleryPage.Folders, onClick: (Folder) -> Unit) {
+fun ImageGalleryFolders(state: ImageGalleryPage.Folders, onClick: (Folder) -> Unit, onRetry: () -> Unit) {
     val screenWidth = LocalConfiguration.current.screenWidthDp
 
     val gradient = Brush.verticalGradient(
@@ -106,12 +104,12 @@ fun ImageGalleryFolders(state: ImageGalleryPage.Folders, onClick: (Folder) -> Un
             }
         }
 
-        is Lce.Error -> GenericError { }
+        is Lce.Error -> GenericError(cause = content.cause, action = onRetry)
     }
 }
 
 @Composable
-fun ImageGalleryMedia(state: ImageGalleryPage.Files, onFileSelected: (Media) -> Unit) {
+fun ImageGalleryMedia(state: ImageGalleryPage.Files, onFileSelected: (Media) -> Unit, onRetry: () -> Unit) {
     val screenWidth = LocalConfiguration.current.screenWidthDp
 
     Column {
@@ -149,7 +147,7 @@ fun ImageGalleryMedia(state: ImageGalleryPage.Files, onFileSelected: (Media) ->
                 }
             }
 
-            is Lce.Error -> GenericError { }
+            is Lce.Error -> GenericError(cause = content.cause, action = onRetry)
         }
 
     }
diff --git a/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryViewModel.kt b/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryViewModel.kt
index 59cbbb4..0620315 100644
--- a/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryViewModel.kt
+++ b/features/messenger/src/main/kotlin/app/dapk/st/messenger/gallery/ImageGalleryViewModel.kt
@@ -48,7 +48,7 @@ class ImageGalleryViewModel(
                     route = ImageGalleryPage.Routes.files,
                     label = page.label,
                     parent = ImageGalleryPage.Routes.folders,
-                    state = ImageGalleryPage.Files(Lce.Loading())
+                    state = ImageGalleryPage.Files(Lce.Loading(), folder)
                 )
             )
         }
@@ -78,7 +78,7 @@ data class ImageGalleryState(
 
 sealed interface ImageGalleryPage {
     data class Folders(val content: Lce<List<Folder>>) : ImageGalleryPage
-    data class Files(val content: Lce<List<Media>>) : ImageGalleryPage
+    data class Files(val content: Lce<List<Media>>, val folder: Folder) : ImageGalleryPage
 
     object Routes {
         val folders = Route<Folders>("Folders")
diff --git a/features/settings/src/main/kotlin/app/dapk/st/settings/SettingsScreen.kt b/features/settings/src/main/kotlin/app/dapk/st/settings/SettingsScreen.kt
index 402654b..4ffb0a9 100644
--- a/features/settings/src/main/kotlin/app/dapk/st/settings/SettingsScreen.kt
+++ b/features/settings/src/main/kotlin/app/dapk/st/settings/SettingsScreen.kt
@@ -31,7 +31,6 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
-import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
@@ -160,9 +159,7 @@ internal fun SettingsScreen(viewModel: SettingsViewModel, onSignOut: () -> Unit,
                     GenericError(
                         message = message,
                         label = "Close",
-                        moreDetails = result.cause.takeAs<ImportResult.Error.Type.Unknown>()?.let {
-                            "${it.cause::class.java.simpleName}: ${it.cause.message}"
-                        }
+                        cause = result.cause.takeAs<ImportResult.Error.Type.Unknown>()?.cause
                     ) {
                         navigator.navigate.upToHome()
                     }