diff --git a/res/layout/message_view_invitation.xml b/res/layout/message_view_invitation.xml
index 8f092d47a..f4b3e6a99 100644
--- a/res/layout/message_view_invitation.xml
+++ b/res/layout/message_view_invitation.xml
@@ -25,7 +25,6 @@
     >
 
     <RelativeLayout
-         android:id="@+id/invite_link"
          android:layout_width="match_parent"
          android:layout_height="wrap_content"
          android:gravity="center_vertical"
@@ -33,7 +32,7 @@
 
         <TextView
              android:layout_width="wrap_content"
-             android:layout_height="wrap_content"
+             android:layout_height="match_parent"
              android:singleLine="true"
              android:ellipsize="end"
              android:text="@string/message_view_invite_title"
@@ -42,15 +41,16 @@
              android:layout_marginLeft="6dip"
              android:layout_alignParentLeft="true"
              android:gravity="center_vertical"
+             android:layout_centerVertical="true"
              />
 
-        <TextView
+        <Button
+             android:id="@+id/invite_link"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
              android:singleLine="true"
              android:ellipsize="end"
              android:text="@string/message_view_invite_view"
-             android:textColor="?android:attr/textColorPrimaryInverse"
              android:layout_marginRight="6dip"
              android:layout_alignParentRight="true"
              android:gravity="center_vertical"
@@ -66,7 +66,7 @@
 
     <LinearLayout
          android:layout_width="match_parent"
-         android:layout_height="wrap_content"
+         android:layout_height="44dip"
          android:orientation="horizontal"
          android:gravity="center_vertical"
          android:layout_margin="2dip"
@@ -96,6 +96,7 @@
              android:textColor="?android:attr/textColorPrimaryInverse"
              android:drawableLeft="@drawable/btn_invite_yes"
              android:gravity="center_vertical"
+             android:focusable="true"
              />
 
         <TextView
@@ -109,6 +110,7 @@
              android:textColor="?android:attr/textColorPrimaryInverse"
              android:drawableLeft="@drawable/btn_invite_maybe"
              android:gravity="center_vertical"
+             android:focusable="true"
              />
 
         <TextView
@@ -121,6 +123,7 @@
              android:textColor="?android:attr/textColorPrimaryInverse"
              android:drawableLeft="@drawable/btn_invite_no"
              android:gravity="center_vertical"
+             android:focusable="true"
              />
 
         <View