diff --git a/app/src/main/res/layout/activity_accounts.xml b/app/src/main/res/layout/activity_accounts.xml
index 2660ab27..4bb06992 100644
--- a/app/src/main/res/layout/activity_accounts.xml
+++ b/app/src/main/res/layout/activity_accounts.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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:orientation="vertical"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
@@ -12,12 +11,11 @@
 
     <ListView
         android:id="@+id/accounts"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
-
-    <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" >
+        android:layout_height="match_parent"
+        android:layout_above="@id/newAor"
+        android:transcriptMode="alwaysScroll" >
+    </ListView>
 
         <EditText
             android:id="@+id/newAor"
@@ -26,6 +24,7 @@
             android:layout_centerVertical="true"
             android:textSize="20sp"
             android:layout_alignParentStart="true"
+            android:layout_alignParentBottom="true"
             android:layout_marginStart="0dp"
             android:layout_toStartOf="@+id/addAccount"
             android:inputType="textEmailAddress"
@@ -40,6 +39,7 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
+            android:layout_alignParentBottom="true"
             android:layout_gravity="end"
             android:layout_marginStart="6dp"
             android:src="@drawable/action_add"
@@ -47,8 +47,6 @@
             android:scaleType="centerCrop" >
         </ImageButton>
 
-    </RelativeLayout>
-
-</LinearLayout>
+</RelativeLayout>