diff --git a/astrid/res/layout/date_time_picker.xml b/astrid/res/layout/date_time_picker.xml
index ec5bb7695..4986a0798 100644
--- a/astrid/res/layout/date_time_picker.xml
+++ b/astrid/res/layout/date_time_picker.xml
@@ -23,15 +23,10 @@
 		      android:layout_width="fill_parent"
 		      android:layout_height="wrap_content"
 		      android:orientation="horizontal"/>
-		  <com.todoroo.astrid.ui.CalendarView
-            android:id="@+id/calendar"
-            android:layout_width="fill_parent"
-            android:layout_height="250dip"
-            android:layout_weight="1" />
 		  <LinearLayout
 		      android:layout_width="fill_parent"
 		      android:layout_height="wrap_content"
-		      android:layout_marginBottom="10dip"
+		      android:layout_marginBottom="3dip"
 		      android:orientation="horizontal"
 		      android:layout_weight="1">
 	          <LinearLayout
@@ -52,6 +47,11 @@
 	          	  android:orientation="vertical"/>
 
 		  </LinearLayout>
+		  <com.todoroo.astrid.ui.CalendarView
+            android:id="@+id/calendar"
+            android:layout_width="fill_parent"
+            android:layout_height="250dip"
+            android:layout_weight="1" />
 	      <View
 	         android:id="@+id/TEA_Separator"
              android:layout_width="fill_parent"