diff --git a/css/style.css b/css/style.css
index 7d72567..c6f9ee9 100644
--- a/css/style.css
+++ b/css/style.css
@@ -11,6 +11,8 @@
 	-moz-user-select: none;
 	-ms-user-select: none;
 	user-select: none;
+	resize: horizontal;
+	overflow-x: auto;
 }
 
 #app-mailbox-peers > ul {
@@ -51,6 +53,11 @@
 	text-align: center;
 }
 
+#ocsms-app-content {
+	height: 100%;
+	overflow-y: auto;
+}
+
 #app-content-wrapper {
 	padding: 15px;
 	margin-top: 100px;
diff --git a/templates/main.php b/templates/main.php
index 708e6e1..fbe840b 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -58,7 +58,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 		</div> <!-- app-settings-content -->
 	</div>
 
-	<div id="app-content">
+	<div id="ocsms-app-content">
 		<div id="app-content-loader" class="icon-loading" ng-show="isConvLoading">
 		</div>
 		<div id="app-content-header" ng-show="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''"