diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index f528a48b7..3257bd265 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -28,6 +28,7 @@
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:orientation="vertical"
         >
         <ProgressBar
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 77001713d..5ac201e4b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -115,12 +115,13 @@
     <style name="Attachment" />
 
     <style name="Attachment.Button" parent="@android:style/Widget.Holo.Button">
+        <item name="android:minHeight">0dip</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">0dip</item>
         <item name="android:layout_weight">1</item>
         <item name="android:layout_gravity">center_vertical</item>
-        <item name="android:paddingTop">0dip</item>
-        <item name="android:paddingBottom">0dip</item>
+        <item name="android:paddingTop">2dip</item>
+        <item name="android:paddingBottom">2dip</item>
         <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
         <item name="android:textColor">@color/buttontext</item>
         <item name="android:singleLine">true</item>