diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d86d5bb15af62cd0ad8025103119de8e6779ef73..85cf2dc659d4d4155c276abf1793383f240e2352 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -40,7 +40,6 @@
 
         <activity
             android:name="eu.siacs.conversations.ui.ConversationActivity"
-            android:configChanges="orientation|screenSize"
             android:label="@string/title_activity_conversations"
             android:launchMode="singleTask"
             android:windowSoftInputMode="stateHidden" >
diff --git a/res/layout-w360dp/fragment_conversations_overview.xml b/res/layout-w360dp/fragment_conversations_overview.xml
index a639ed56b7e2edddf73243aa7d0637a5abaeb486..a600118dbf7d1b799ea02f7a392c2ec50621482f 100644
--- a/res/layout-w360dp/fragment_conversations_overview.xml
+++ b/res/layout-w360dp/fragment_conversations_overview.xml
@@ -1,4 +1,4 @@
-<eu.siacs.conversations.ui.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/content_view_spl"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
@@ -27,4 +27,4 @@
         android:orientation="vertical" >
     </LinearLayout>
 
-</eu.siacs.conversations.ui.SlidingPaneLayout>
\ No newline at end of file
+</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file