diff --git a/dev/Styles/@Boot.css b/dev/Styles/@Boot.css
index c3b393522..6160a0223 100644
--- a/dev/Styles/@Boot.css
+++ b/dev/Styles/@Boot.css
@@ -5,14 +5,14 @@
 }
 
 html, body {
-	font-family: var(--fontSans);
 	margin: 0;
 	padding: 0;
 }
 
-body {
-	background: var(--main-bg-color, #aaa);
+#rl-app {
+	background-color: var(--main-bg-color, #aaa);
 	color: var(--main-color, #333);
+	font-family: var(--fontSans);
 }
 
 #rl-loading, #rl-loading-error {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index 873b26b78..276db66ce 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -10,7 +10,7 @@ html, body {
 	-webkit-text-size-adjust: 100%; /* 2 */
 }
 
-body {
+#rl-app {
 	-webkit-touch-callout: none;
 	font-size: @baseFontSize;
 	position: fixed;
@@ -26,7 +26,7 @@ html.list-loading body {
 }
 
 @media screen and (min-width: 1000px) {
-	body {
+	#rl-app {
 		background-image: var(--main-bg-image);
 		background-size: var(--main-bg-size);
 		background-repeat: var(--main-bg-repeat);
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
index 665dc9dd6..f7ee0f3a3 100644
--- a/integrations/nextcloud/snappymail/css/embed.css
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -1,7 +1,7 @@
 /*
 This stylesheet is used when SnappyMail runs in embed mode.
 */
-#rl-app {
+#content #rl-app {
 	position: relative;
 	min-width: 100%;
 	min-height: 100%;