diff --git a/astrid/res/layout/control_set_repeat.xml b/astrid/res/layout/control_set_repeat.xml
index a52639773..ac955b776 100644
--- a/astrid/res/layout/control_set_repeat.xml
+++ b/astrid/res/layout/control_set_repeat.xml
@@ -10,7 +10,6 @@
     android:layout_height="fill_parent"
     android:paddingLeft="5dip"
     android:paddingRight="5dip"
-    android:paddingBottom="5dip"
     android:orientation="vertical">
       
   <LinearLayout android:id="@+id/repeatContainer"
@@ -48,34 +47,25 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content" 
         android:gravity="center"/>
-    
-    <Button android:id="@+id/repeatUntil"
-          android:layout_width="fill_parent"
-          android:layout_height="wrap_content" />
-              
   </LinearLayout>  
+  
   <LinearLayout
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:layout_weight="1"
-      android:layout_marginTop="15dip"
-      android:layout_marginBottom="-15dip">
-	  <include layout="@layout/control_dialog_ok"
-	      android:layout_marginRight="3dip"/>
-	  <Button xmlns:android="http://schemas.android.com/apk/res/android"
-	    android:id="@+id/edit_dont_repeat"
-	    android:text="@string/repeat_dont"	    
-	    android:layout_width="150dip"
-	    android:layout_height="45dip"
-	    android:layout_marginTop="10dip"
-	    android:layout_marginBottom="5dip"
-	    android:layout_weight="1"
-	    android:layout_gravity="center_horizontal"
-	    android:layout_marginLeft="3dip"
-	    android:background="@drawable/footer_editbutton"
-	    android:textStyle="bold"
-	    android:layout_alignParentBottom="true" />
+      android:orientation="horizontal">
+      <Button android:id="@+id/repeatUntil"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content" 
+          android:layout_weight="1"/>
+        <Button xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@+id/edit_dont_repeat"
+          android:text="@string/repeat_dont"        
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:layout_weight="1"/>
+      
   </LinearLayout>
   
+  <include layout="@layout/control_dialog_ok" />
 </LinearLayout>