diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 39e64b09c15..9015613fa01 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -21,7 +21,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:layout_width="wrap_content"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="center_horizontal"
 >
@@ -36,17 +36,18 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:text="@string/enter_password"
         android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+        android:layout_gravity="center_horizontal"
         />
     <TextView
         android:id="@+id/owner_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="10dip"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit ="marquee_forever"
-        android:scrollHorizontally="true"
-        android:gravity="center"
         android:textSize="16sp"
         android:textAppearance="?android:attr/textAppearanceMedium"
         />