diff --git a/app/src/main/java/ch/dissem/apps/abit/AddressDetailActivity.java b/app/src/main/java/ch/dissem/apps/abit/AddressDetailActivity.java
index e26749a..077a5d4 100644
--- a/app/src/main/java/ch/dissem/apps/abit/AddressDetailActivity.java
+++ b/app/src/main/java/ch/dissem/apps/abit/AddressDetailActivity.java
@@ -38,7 +38,7 @@ public class AddressDetailActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.toolbar_layout);
+        setContentView(R.layout.scrolling_toolbar_layout);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/ch/dissem/apps/abit/MessageDetailActivity.java b/app/src/main/java/ch/dissem/apps/abit/MessageDetailActivity.java
index 77be840..7957185 100644
--- a/app/src/main/java/ch/dissem/apps/abit/MessageDetailActivity.java
+++ b/app/src/main/java/ch/dissem/apps/abit/MessageDetailActivity.java
@@ -22,7 +22,7 @@ public class MessageDetailActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.toolbar_layout);
+        setContentView(R.layout.scrolling_toolbar_layout);
 
         final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/java/ch/dissem/apps/abit/SettingsActivity.java b/app/src/main/java/ch/dissem/apps/abit/SettingsActivity.java
index 9199c42..6a86ef2 100644
--- a/app/src/main/java/ch/dissem/apps/abit/SettingsActivity.java
+++ b/app/src/main/java/ch/dissem/apps/abit/SettingsActivity.java
@@ -11,7 +11,7 @@ public class SettingsActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.toolbar_layout);
+        setContentView(R.layout.scrolling_toolbar_layout);
 
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/res/layout/fragment_compose_message.xml b/app/src/main/res/layout/fragment_compose_message.xml
index 72c23c7..35153ca 100644
--- a/app/src/main/res/layout/fragment_compose_message.xml
+++ b/app/src/main/res/layout/fragment_compose_message.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
 
     <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
@@ -16,7 +15,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/to"
             android:inputType="textNoSuggestions"
-            android:singleLine="true" />
+            android:singleLine="true"/>
 
     </android.support.design.widget.TextInputLayout>
 
@@ -30,7 +29,7 @@
             android:layout_height="wrap_content"
             android:hint="@string/subject"
             android:inputType="textEmailSubject"
-            android:textAppearance="?android:attr/textAppearanceLarge" />
+            android:textAppearance="?android:attr/textAppearanceLarge"/>
 
     </android.support.design.widget.TextInputLayout>
 
@@ -39,9 +38,9 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
+        android:gravity="start|top"
         android:hint="@string/compose_body_hint"
         android:inputType="textMultiLine|textCapSentences"
-        android:gravity="top"
-        android:isScrollContainer="true" />
+        android:scrollbars="vertical"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/scrolling_toolbar_layout.xml b/app/src/main/res/layout/scrolling_toolbar_layout.xml
new file mode 100644
index 0000000..9abd179
--- /dev/null
+++ b/app/src/main/res/layout/scrolling_toolbar_layout.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 android:fitsSystemWindows="true"
+                                                 tools:context=".ComposeMessageActivity">
+
+    <FrameLayout android:id="@+id/content"
+                 xmlns:android="http://schemas.android.com/apk/res/android"
+                 xmlns:tools="http://schemas.android.com/tools"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                 tools:context=".ComposeMessageActivity"
+                 tools:layout="@layout/fragment_compose_message"/>
+
+    <android.support.design.widget.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            tools:ignore="UnusedAttribute"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+</android.support.design.widget.CoordinatorLayout>
+
diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml
index ab60f4a..ce3946d 100644
--- a/app/src/main/res/layout/toolbar_layout.xml
+++ b/app/src/main/res/layout/toolbar_layout.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
                                                  xmlns:tools="http://schemas.android.com/tools"
                                                  android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+                                                 android:layout_height="match_parent"
+                                                 android:fitsSystemWindows="true"
+                                                 tools:context=".ComposeMessageActivity">
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_below="@id/toolbar"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context=".MessageListActivity"
-        tools:layout="@android:layout/list_content" />
+    <FrameLayout android:id="@+id/content"
+                 xmlns:android="http://schemas.android.com/apk/res/android"
+                 xmlns:tools="http://schemas.android.com/tools"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 android:layout_marginTop="@dimen/action_bar_offset"
+                 tools:context=".ComposeMessageActivity"
+                 tools:layout="@layout/fragment_compose_message"/>
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"