diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index abc4b89de3c0eb06532fff1f08e6fd8c7163f997..606b6daa4f85656a26766715e3e4492db2f50c61 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -40,6 +40,8 @@
             android:name=".ui.ConversationActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
+            android:minWidth="300dp"
+            android:minHeight="300dp"
             android:windowSoftInputMode="stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -91,13 +93,11 @@
         <activity
             android:name=".ui.WelcomeActivity"
             android:label="@string/app_name"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.MagicCreateActivity"
             android:label="@string/create_account"
-            android:launchMode="singleTask"
-            android:screenOrientation="portrait" />
+            android:launchMode="singleTask"/>
         <activity
             android:name=".ui.SetPresenceActivity"
             android:configChanges="orientation|screenSize"
diff --git a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
index 1b16e565ddb9a9167863253e99bc21372c6fb423..f0c7229510a0c7f0ebb87e8cc0b55fdcf62b5f81 100644
--- a/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/MagicCreateActivity.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.ui;
 
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -39,6 +40,9 @@ public class MagicCreateActivity extends XmppActivity implements TextWatcher {
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
+		if (getResources().getBoolean(R.bool.portrait_only)) {
+			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+		}
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.magic_create);
 		mFullJidDisplay = (TextView) findViewById(R.id.full_jid);
diff --git a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
index 78f0f60940ab32a31e0205c9fbb12b7d7ca8f121..3c837b945e036a454a1e349f5ef43ce8c035ba8d 100644
--- a/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/WelcomeActivity.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.ui;
 
 import android.app.Activity;
 import android.content.Intent;
+import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.Button;
@@ -12,6 +13,9 @@ public class WelcomeActivity extends Activity {
 
 	@Override
 	protected void onCreate(final Bundle savedInstanceState) {
+		if (getResources().getBoolean(R.bool.portrait_only)) {
+			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+		}
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.welcome);
 		final Button createAccount = (Button) findViewById(R.id.create_account);
diff --git a/src/main/res/values-sw600dp/defaults.xml b/src/main/res/values-sw600dp/defaults.xml
index e23a93de366856ae6de8f7978c72b0998d556f91..b22a4ca8ab3718760fcdbe08a6b05ef59155fd43 100644
--- a/src/main/res/values-sw600dp/defaults.xml
+++ b/src/main/res/values-sw600dp/defaults.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_resource">Tablet</string>
+    <bool name="portrait_only">false</bool>
 </resources>
\ No newline at end of file
diff --git a/src/main/res/values-w300dp/dimens.xml b/src/main/res/values-w300dp/dimens.xml
new file mode 100644
index 0000000000000000000000000000000000000000..28341a39591a5645a4e7f3b1a7dc10eb4b371490
--- /dev/null
+++ b/src/main/res/values-w300dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="conversations_overview_width">276dp</dimen>
+</resources>
diff --git a/src/main/res/values/defaults.xml b/src/main/res/values/defaults.xml
index be795ed400599618fb255682bbde19e99040012a..7d613ab5ed2a8c9d3a902415827bbc1539d7a975 100644
--- a/src/main/res/values/defaults.xml
+++ b/src/main/res/values/defaults.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="default_resource">Phone</string>
+    <bool name="portrait_only">true</bool>
 </resources>
\ No newline at end of file