diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index e0ead4c75..760781a3d 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -127,26 +127,42 @@ limitations under the License.
     </TableLayout>
   </ScrollView>
   <LinearLayout
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
     android:background="@drawable/list_bar"
-    android:padding="3dip">
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal"
+    android:paddingLeft="2dip"
+    android:paddingRight="2dip"    
+    android:paddingTop="4dip">
+    <!-- left spacer -->
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_weight="0.25"
+      android:layout_width="0dip"
+      android:orientation="horizontal"
+      android:visibility="gone"/>
     <Button android:id="@+id/sendtogoogle_cancel"
-      android:layout_width="wrap_content"
+      android:layout_gravity="left"
       android:layout_height="48dip"
-      android:layout_gravity="right"
+      android:layout_weight="1"
+      android:layout_width="0dip"      
+      android:maxLines="2"
       android:text="@string/cancel"
       android:textSize="14dip"/>
-    <TextView
-      android:layout_width="0dip"
-      android:layout_height="wrap_content"
-      android:layout_weight="1"/>
     <Button android:id="@+id/sendtogoogle_send_now"
-      android:layout_width="wrap_content"
-      android:layout_height="48dip"
       android:layout_gravity="right"
+      android:layout_height="48dip"      
+      android:layout_weight="1"
+      android:layout_width="0dip"
+      android:maxLines="2"
       android:text="@string/sendtogoogle_send_now"
       android:textSize="14dip"/>
+    <!--  right spacer -->
+    <LinearLayout
+      android:layout_height="wrap_content"
+      android:layout_weight="0.25"
+      android:layout_width="0dip"
+      android:orientation="horizontal"
+      android:visibility="gone"/>
   </LinearLayout>
 </LinearLayout>