diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 6a9d4140a..8cbae31a4 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -70,6 +70,16 @@ dialog:not(.animate) {
 	top: -25%;
 }
 
+/**
+ * https://github.com/the-djmaze/snappymail/issues/686
+@media screen and (max-width: 999px) {
+ */
+.rl-mobile dialog {
+	margin: 0 auto;
+	max-height: calc(100vh - 100px);
+	width: 100%;
+}
+
 dialog > header {
 	padding: 9px 15px;
 	border-bottom: 1px solid var(--border-color, #ddd);
diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index a1c67e36a..786b43739 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -146,15 +146,6 @@
 	}
 }
 
-@media screen and (max-width: 999px) {
-	#V-PopupsCompose {
-		border: 0;
-		height: calc(100vh - 100px);
-		margin: 0 auto;
-		width: 100%;
-	}
-}
-
 .minimize-custom {
 	border: 0 solid #333;
 	border-bottom-width: 3px;