diff --git a/res/layout-land/message_list_item.xml b/res/layout-land/message_list_item.xml
index 68bde58f4..2ed4df13c 100644
--- a/res/layout-land/message_list_item.xml
+++ b/res/layout-land/message_list_item.xml
@@ -2,15 +2,15 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="20px"
-    android:paddingRight="1px"
-    android:paddingTop="2px"
+    android:layout_height="20dip"
+    android:paddingRight="1dip"
+    android:paddingTop="2dip"
     android:background="@drawable/message_list_item_background">
     <View
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
-        android:layout_width="4px"
-        android:layout_height="20px"
+        android:layout_width="4dip"
+        android:layout_height="20dip"
         android:layout_centerVertical="true"
 	android:layout_alignParentLeft="true" />
     <TextView
@@ -19,19 +19,19 @@
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
         android:textColor="?android:attr/textColorPrimary"
-        android:layout_width="50px"
+        android:layout_width="50dip"
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true" />
     <TextView
         android:id="@+id/from"
         android:ellipsize="end"
         android:singleLine="true"
-        android:layout_width="110px"
+        android:layout_width="110dip"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
-        android:paddingLeft="3px"
-        android:paddingRight="3px"
+        android:paddingLeft="3dip"
+        android:paddingRight="3dip"
         android:layout_toLeftOf="@+id/date" />
     <TextView
         android:id="@+id/subject"
@@ -41,8 +41,8 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
-        android:layout_marginRight="1px"
+        android:paddingLeft="10dip"
+        android:layout_marginRight="1dip"
 	android:layout_toRightOf="@+id/chip"
         android:layout_toLeftOf="@+id/from" />
 </RelativeLayout>
diff --git a/res/layout-land/message_view.xml b/res/layout-land/message_view.xml
index ed8b8654e..70cc82890 100644
--- a/res/layout-land/message_view.xml
+++ b/res/layout-land/message_view.xml
@@ -22,19 +22,19 @@
             <include layout="@layout/message_view_header" />
             <View
        	     	android:layout_width="fill_parent"
-        	 	android:layout_height="0px"
+        	 	android:layout_height="0dip"
          	 	android:layout_weight="1" /> 
 			<LinearLayout
 		    	android:id="@+id/scrolling_buttons"
 		        android:orientation="horizontal"
 		        android:layout_width="fill_parent"
-		        android:layout_height="57px"
+		        android:layout_height="57dip"
 		        android:background="@drawable/ic_email_thread_open_bottom_default"
 		        android:gravity="center_vertical">
 		        <Button
 		            android:id="@+id/previous_scrolling"
 		            android:text="@string/message_view_prev_action"
-                    android:textSize="35px"
+                    android:textSize="35dip"
 		            android:layout_height="wrap_content"
 		            android:layout_width="0dip"
                     android:padding="0dip"
@@ -60,7 +60,7 @@
 		         <Button
 		            android:id="@+id/next_scrolling"
 		            android:text="@string/message_view_next_action"
-                    android:textSize="35px"
+                    android:textSize="35dip"
 		            android:layout_height="wrap_content"
 		            android:layout_width="0dip"
                     android:padding="0dip"
@@ -73,13 +73,13 @@
     	android:id="@+id/bottom_buttons"
         android:orientation="horizontal"
         android:layout_width="fill_parent"
-        android:layout_height="57px"
+        android:layout_height="57dip"
         android:background="@drawable/ic_email_thread_open_bottom_default"
         android:gravity="center_vertical">
         <Button
             android:id="@+id/previous"
             android:text="@string/message_view_prev_action"
-            android:textSize="35px"
+            android:textSize="35dip"
             android:layout_height="wrap_content"
             android:padding="0dip"
             android:layout_width="0dip"
@@ -105,7 +105,7 @@
          <Button
             android:id="@+id/next"
             android:text="@string/message_view_next_action"
-            android:textSize="35px"
+            android:textSize="35dip"
             android:padding="0dip"
             android:layout_height="wrap_content"
             android:layout_width="0dip"
diff --git a/res/layout/account_setup_basics.xml b/res/layout/account_setup_basics.xml
index 00a43ee59..1bbc7a411 100644
--- a/res/layout/account_setup_basics.xml
+++ b/res/layout/account_setup_basics.xml
@@ -39,12 +39,12 @@
         />
     <View
         android:layout_width="fill_parent"
-        android:layout_height="0px"
+        android:layout_height="0dip"
         android:layout_weight="1"
         />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
+        android:layout_height="54dip"
         
         >
         <Button
diff --git a/res/layout/account_setup_check_settings.xml b/res/layout/account_setup_check_settings.xml
index 21f08706b..c24a669f9 100644
--- a/res/layout/account_setup_check_settings.xml
+++ b/res/layout/account_setup_check_settings.xml
@@ -16,7 +16,7 @@
         android:gravity="center_horizontal"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textColor="?android:attr/textColorPrimary"
-        android:paddingBottom="6px" />
+        android:paddingBottom="6dip" />
     <ProgressBar
         android:id="@+id/progress"
         android:layout_height="wrap_content"
@@ -24,11 +24,11 @@
         style="?android:attr/progressBarStyleHorizontal" />
     <View
         android:layout_width="fill_parent"
-        android:layout_height="0px"
+        android:layout_height="0dip"
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
+        android:layout_height="54dip"
         
         >
         <Button
diff --git a/res/layout/account_setup_incoming.xml b/res/layout/account_setup_incoming.xml
index 07186da9d..8643caf35 100644
--- a/res/layout/account_setup_incoming.xml
+++ b/res/layout/account_setup_incoming.xml
@@ -159,11 +159,11 @@
         </LinearLayout>
         <View
             android:layout_width="fill_parent"
-            android:layout_height="0px"
+            android:layout_height="0dip"
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="54px"
+            android:layout_height="54dip"
             >
             <Button
                 android:id="@+id/next"
diff --git a/res/layout/account_setup_names.xml b/res/layout/account_setup_names.xml
index e86535338..ef12e7032 100644
--- a/res/layout/account_setup_names.xml
+++ b/res/layout/account_setup_names.xml
@@ -34,12 +34,12 @@
         android:layout_height="wrap_content"
         android:layout_width="fill_parent" />
     <View
-        android:layout_height="0px"
+        android:layout_height="0dip"
         android:layout_width="fill_parent"
         android:layout_weight="1" />
     <RelativeLayout
         android:layout_width="fill_parent"
-        android:layout_height="54px"
+        android:layout_height="54dip"
         >
         <Button
             android:id="@+id/done"
diff --git a/res/layout/account_setup_outgoing.xml b/res/layout/account_setup_outgoing.xml
index 8cb896318..1f2c3b3c6 100644
--- a/res/layout/account_setup_outgoing.xml
+++ b/res/layout/account_setup_outgoing.xml
@@ -79,11 +79,11 @@
         </LinearLayout>
         <View
             android:layout_width="fill_parent"
-            android:layout_height="0px"
+            android:layout_height="0dip"
             android:layout_weight="1" />
         <RelativeLayout
             android:layout_width="fill_parent"
-            android:layout_height="54px"
+            android:layout_height="54dip"
             >
             <Button
                 android:id="@+id/next"
diff --git a/res/layout/accounts.xml b/res/layout/accounts.xml
index c4db30419..064c95674 100644
--- a/res/layout/accounts.xml
+++ b/res/layout/accounts.xml
@@ -29,11 +29,11 @@
                 />
             <View
                 android:layout_width="fill_parent"
-                android:layout_height="0px"
+                android:layout_height="0dip"
                 android:layout_weight="1" />
             <RelativeLayout
                 android:layout_width="fill_parent"
-                android:layout_height="54px"
+                android:layout_height="54dip"
                 android:gravity="bottom|right"
                 >
                 <Button
diff --git a/res/layout/accounts_item.xml b/res/layout/accounts_item.xml
index 3eac5c86d..eddffc8a9 100644
--- a/res/layout/accounts_item.xml
+++ b/res/layout/accounts_item.xml
@@ -6,12 +6,12 @@
     android:orientation="horizontal"
     android:gravity="center_vertical"
     
-    android:paddingRight="4px">
+    android:paddingRight="4dip">
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:paddingLeft="6px">
+        android:paddingLeft="6dip">
         <TextView
             android:id="@+id/description"
             android:textAppearance="?android:attr/textAppearanceMedium"
@@ -27,7 +27,7 @@
     </LinearLayout>
     <View
         android:layout_height="fill_parent"
-        android:layout_width="0px"
+        android:layout_width="0dip"
         android:layout_weight="1" />
     <TextView
         android:id="@+id/new_message_count"
@@ -38,8 +38,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/text_box"
-        android:paddingLeft="10px"
-        android:paddingRight="10px"
-        android:minWidth="64px"
+        android:paddingLeft="10dip"
+        android:paddingRight="10dip"
+        android:minWidth="64dip"
         android:gravity="right" />
 </LinearLayout>
diff --git a/res/layout/folder_list_header.xml b/res/layout/folder_list_header.xml
index 5e87169b3..e2a3678e3 100644
--- a/res/layout/folder_list_header.xml
+++ b/res/layout/folder_list_header.xml
@@ -9,9 +9,9 @@
    <Button
        android:id="@+id/account_list"
             android:text="@string/back_to_accounts_action"
-            android:textSize="30px"
-            android:padding="5px"
-            android:layout_width="50px"
+            android:textSize="30dip"
+            android:padding="5dip"
+            android:layout_width="50dip"
             android:layout_height="fill_parent"
             android:minWidth="@dimen/button_minWidth"
             android:layout_centerVertical="true" 
@@ -22,7 +22,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
+        android:paddingLeft="10dip"
         android:gravity="left"
         />
 </LinearLayout>
diff --git a/res/layout/folder_list_item.xml b/res/layout/folder_list_item.xml
index 6b3b280de..dd98c8a8b 100644
--- a/res/layout/folder_list_item.xml
+++ b/res/layout/folder_list_item.xml
@@ -7,8 +7,8 @@
     android:gravity="center_vertical"
     android:background="@android:color/transparent"
     
-    android:paddingLeft="36px"
-    android:paddingRight="4px">
+    android:paddingLeft="36dip"
+    android:paddingRight="4dip">
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -29,7 +29,7 @@
     </LinearLayout>
     <View
         android:layout_height="fill_parent"
-        android:layout_width="0px"
+        android:layout_width="0dip"
         android:layout_weight="1" />
     <TextView
         android:id="@+id/folder_unread_message_count"
@@ -40,8 +40,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@drawable/text_box"
-        android:paddingLeft="10px"
-        android:paddingRight="10px"
-        android:minWidth="64px"
+        android:paddingLeft="10dip"
+        android:paddingRight="10dip"
+        android:minWidth="64dip"
         android:gravity="right" />
 </LinearLayout>
diff --git a/res/layout/message_compose.xml b/res/layout/message_compose.xml
index 0b21c0952..d1cf8f6d7 100644
--- a/res/layout/message_compose.xml
+++ b/res/layout/message_compose.xml
@@ -17,16 +17,16 @@
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/primary_text_light"
-                    android:layout_marginLeft="6px"
-                    android:layout_marginRight="6px"/>
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"/>
                 
                 <MultiAutoCompleteTextView
                     android:id="@+id/to" android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/primary_text_light"
-                    android:layout_marginLeft="6px"
-                    android:layout_marginRight="6px"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"
                     android:inputType="textEmailAddress|textMultiLine"
                     android:imeOptions="actionNext"
                     android:hint="@string/message_compose_to_hint" />
@@ -35,8 +35,8 @@
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/primary_text_light"
-                    android:layout_marginLeft="6px"
-                    android:layout_marginRight="6px"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"
                     android:inputType="textEmailAddress|textMultiLine"
                     android:imeOptions="actionNext"
                     android:hint="@string/message_compose_cc_hint"
@@ -46,8 +46,8 @@
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@android:color/primary_text_light"
-                    android:layout_marginLeft="6px"
-                    android:layout_marginRight="6px"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"
                     android:inputType="textEmailAddress|textMultiLine"
                     android:imeOptions="actionNext"
                     android:hint="@string/message_compose_bcc_hint"
@@ -58,8 +58,8 @@
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:layout_height="wrap_content"
                     android:textColor="@android:color/primary_text_light"
-                    android:layout_marginLeft="6px"
-                    android:layout_marginRight="6px"
+                    android:layout_marginLeft="6dip"
+                    android:layout_marginRight="6dip"
                     android:hint="@string/message_compose_subject_hint"
                     android:inputType="textEmailSubject|textAutoCorrect|textCapSentences|textImeMultiLine" 
                     android:imeOptions="actionNext"
@@ -73,7 +73,7 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical" />
                 <View android:layout_width="fill_parent"
-                    android:layout_height="1px"
+                    android:layout_height="1dip"
                     android:background="@drawable/divider_horizontal_email" />
             </LinearLayout>
             <EditText android:id="@+id/message_content"
@@ -102,7 +102,7 @@
         
             <RelativeLayout android:id="@+id/quoted_text_bar"
                 android:layout_width="fill_parent"
-                android:layout_height="45px" android:background="@drawable/email_quoted_bar">
+                android:layout_height="45dip" android:background="@drawable/email_quoted_bar">
                 <TextView android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/layout/message_compose_attachment.xml b/res/layout/message_compose_attachment.xml
index 3de821537..06cf18cc2 100644
--- a/res/layout/message_compose_attachment.xml
+++ b/res/layout/message_compose_attachment.xml
@@ -2,35 +2,35 @@
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	android:layout_width="fill_parent"
-	android:layout_height="54px"
-	android:paddingRight="6px"
-	android:paddingTop="6px"
-	android:paddingBottom="6px">
+	android:layout_height="54dip"
+	android:paddingRight="6dip"
+	android:paddingTop="6dip"
+	android:paddingBottom="6dip">
 	<ImageButton
 		android:id="@+id/attachment_delete"
 		android:src="@drawable/ic_delete"
 		android:layout_alignParentRight="true"
-		android:layout_height="42px"
-		android:layout_width="42px" />
+		android:layout_height="42dip"
+		android:layout_width="42dip" />
 	<TextView
 		android:id="@+id/attachment_name"
 		android:textAppearance="?android:attr/textAppearanceMedium"
 		android:textColor="?android:attr/textColorSecondary"
 		android:layout_width="1dip"
-		android:layout_height="42px"
+		android:layout_height="42dip"
 		android:background="@drawable/text_box"
-		android:paddingLeft="36px"
+		android:paddingLeft="36dip"
 		android:singleLine="true"
 		android:ellipsize="start"
 		android:gravity="center_vertical"
-		android:layout_marginLeft="6px"
-		android:layout_marginRight="4px"
+		android:layout_marginLeft="6dip"
+		android:layout_marginRight="4dip"
 		android:layout_alignParentLeft="true"
 		android:layout_toLeftOf="@id/attachment_delete" />
 	<ImageView
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:src="@drawable/ic_email_attachment"
-		android:layout_marginLeft="1px"
+		android:layout_marginLeft="1dip"
 		android:layout_centerVertical="true" />
 </RelativeLayout>
diff --git a/res/layout/message_list_header.xml b/res/layout/message_list_header.xml
index d96646138..9f3612ed0 100644
--- a/res/layout/message_list_header.xml
+++ b/res/layout/message_list_header.xml
@@ -9,9 +9,9 @@
    <Button
             android:id="@+id/folder_list"
             android:text="@string/back_to_folder_list_action"
-            android:textSize="30px"
-            android:padding="5px"
-            android:layout_width="50px"
+            android:textSize="30dip"
+            android:padding="5dip"
+            android:layout_width="50dip"
             android:layout_height="fill_parent"
             android:minWidth="@dimen/button_minWidth"
             android:layout_centerVertical="true" 
@@ -22,7 +22,7 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
+        android:paddingLeft="10dip"
         android:gravity="left"
         />
 </LinearLayout>
diff --git a/res/layout/message_list_item.xml b/res/layout/message_list_item.xml
index 61ae985eb..30c77a7d4 100644
--- a/res/layout/message_list_item.xml
+++ b/res/layout/message_list_item.xml
@@ -2,15 +2,15 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="38px"
-    android:paddingRight="1px"
-    android:paddingTop="2px"
+    android:layout_height="38dip"
+    android:paddingRight="1dip"
+    android:paddingTop="2dip"
     android:background="#999999"
     >
     <View
         android:id="@+id/chip"
         android:background="@drawable/appointment_indicator_leftside_1"
-        android:layout_width="4px"
+        android:layout_width="4dip"
         android:layout_height="fill_parent"
         android:layout_centerVertical="true" />
     <TextView
@@ -21,13 +21,13 @@
         android:textColor="?android:attr/textColorPrimary"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="10px"
-        android:layout_marginRight="1px" />
+        android:paddingLeft="10dip"
+        android:layout_marginRight="1dip" />
     <TextView
         android:id="@+id/date"
         android:textAppearance="?android:attr/textAppearanceSmall"
-        android:paddingRight="5px"
-        android:paddingLeft="5px"
+        android:paddingRight="5dip"
+        android:paddingLeft="5dip"
         android:singleLine="true"
         android:textColor="?android:attr/textColorSecondary"
         android:layout_width="wrap_content"
@@ -44,7 +44,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="?android:attr/textColorSecondary"
-        android:paddingLeft="12px"
+        android:paddingLeft="12dip"
         android:layout_toLeftOf="@id/date"
         android:layout_alignParentLeft="true"
         android:layout_alignParentBottom="true"
diff --git a/res/layout/message_list_item_footer.xml b/res/layout/message_list_item_footer.xml
index 3e5c5ee67..ffa49ba46 100644
--- a/res/layout/message_list_item_footer.xml
+++ b/res/layout/message_list_item_footer.xml
@@ -11,7 +11,7 @@
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         style="?android:attr/progressBarStyleSmall"
-        android:paddingRight="10px"
+        android:paddingRight="10dip"
         />
     <TextView
         android:id="@+id/main_text"
diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 17f5937b9..3fb07fcb0 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -22,13 +22,13 @@
             <include layout="@layout/message_view_header" />
             <View
        	     	android:layout_width="fill_parent"
-        	 	android:layout_height="0px"
+        	 	android:layout_height="0dip"
          	 	android:layout_weight="1" /> 
 		   <LinearLayout
 		    	android:id="@+id/extra_buttons"
 		        android:orientation="horizontal"
 		        android:layout_width="fill_parent"
-		        android:layout_height="57px"
+		        android:layout_height="57dip"
 		        android:gravity="center_vertical">
 		        <Button
 		            android:id="@+id/reply"
@@ -53,14 +53,14 @@
 		    	android:id="@+id/scrolling_buttons"
 		        android:orientation="horizontal"
 		        android:layout_width="fill_parent"
-		        android:layout_height="57px"
+		        android:layout_height="57dip"
 		        android:background="@drawable/ic_email_thread_open_bottom_default"
 		        android:gravity="center_vertical">
 		        <Button
 		            android:id="@+id/previous_scrolling"
 		            android:text="@string/message_view_prev_action"
                     android:textSize="35dip"
-                    android:padding="0px"
+                    android:padding="0dip"
 		            android:layout_height="wrap_content"
 		            android:layout_width="0dip"
 		            android:layout_weight="1" />
@@ -73,7 +73,7 @@
 		            android:layout_weight="1" />
 		       <Button
 		            android:id="@+id/next_scrolling"
-                    android:padding="0px"
+                    android:padding="0dip"
 		            android:text="@string/message_view_next_action"
                     android:textSize="35dip"
 		            android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
             android:id="@+id/previous"
             android:text="@string/message_view_prev_action"
             android:textSize="35dip"
-            android:padding="0px"
+            android:padding="0dip"
             android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" />
@@ -108,7 +108,7 @@
             android:id="@+id/next"
             android:text="@string/message_view_next_action"
             android:textSize="35dip"
-            android:padding="0px"
+            android:padding="0dip"
             android:layout_height="fill_parent"
             android:layout_width="0dip"
             android:layout_weight="1" /> 
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index 49d7aaef5..ba6f13d6a 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -3,11 +3,11 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:paddingBottom="4px">
+    android:paddingBottom="4dip">
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:paddingLeft="4px">
+        android:paddingLeft="4dip">
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -15,13 +15,13 @@
             android:gravity="center_vertical">
             <ImageView
                 android:id="@+id/attachment_icon"
-                android:layout_width="62px"
-                android:layout_height="62px"
+                android:layout_width="62dip"
+                android:layout_height="62dip"
                 android:src="@drawable/attached_image_placeholder"
-                android:layout_marginLeft="4px"
-                android:layout_marginRight="4px"
-                android:layout_marginBottom="4px"
-                android:layout_marginTop="4px" />
+                android:layout_marginLeft="4dip"
+                android:layout_marginRight="4dip"
+                android:layout_marginBottom="4dip"
+                android:layout_marginTop="4dip" />
             <TextView
                 android:id="@+id/attachment_name"
                 android:layout_width="wrap_content"
@@ -54,7 +54,7 @@
                 android:singleLine="true"
                 android:layout_alignParentRight="true"
                 android:layout_below="@id/attachment_name"
-                android:layout_marginTop="6px" />
+                android:layout_marginTop="6dip" />
             <Button
                 android:id="@+id/view"
                 android:layout_width="wrap_content"
@@ -65,7 +65,7 @@
                 android:layout_toLeftOf="@id/download"
                 android:layout_alignWithParentIfMissing="true"
                 android:layout_below="@id/attachment_name"
-                android:layout_marginTop="6px" />
+                android:layout_marginTop="6dip" />
         </RelativeLayout>
     </LinearLayout>
     <LinearLayout
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index 924a359c0..4e6d3e099 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -16,12 +16,12 @@
             android:layout_alignParentLeft="true"
             android:singleLine="true"
             android:ellipsize="end"
-            android:paddingRight="6px" />
+            android:paddingRight="6dip" />
         <View
             android:id="@+id/attachment"
             android:background="@drawable/ic_email_attachment_small"
-            android:layout_width="22px"
-            android:layout_height="22px"
+            android:layout_width="22dip"
+            android:layout_height="22dip"
             android:layout_toRightOf="@id/from"
             android:layout_alignTop="@id/from" />
         <LinearLayout
@@ -47,7 +47,7 @@
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4px"
+                android:layout_marginLeft="4dip"
                 android:singleLine="false"
                 android:ellipsize="none" />
            <TextView
@@ -82,7 +82,7 @@
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="4px"
+                android:layout_marginLeft="4dip"
                 android:singleLine="false"
                 android:ellipsize="none" />
            <TextView
diff --git a/res/layout/recipient_dropdown_item.xml b/res/layout/recipient_dropdown_item.xml
index 80888076d..310416171 100644
--- a/res/layout/recipient_dropdown_item.xml
+++ b/res/layout/recipient_dropdown_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:layout_height="50px"
+    android:layout_height="50dip"
     android:orientation="horizontal">
     <TextView android:id="@+id/text1"
         android:textColor="?android:attr/textColorPrimary"
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_centerVertical="true"
-        android:paddingLeft="6px"
+        android:paddingLeft="6dip"
         android:singleLine="true"
         android:ellipsize="end"
         />
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:layout_toRightOf="@id/text1"
         android:layout_centerVertical="true"
-        android:paddingLeft="6px"
+        android:paddingLeft="6dip"
         android:singleLine="true"
         android:ellipsize="end"
         />