diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index f6aff8a4dade446a93df31912b3a47156c656e79..5ef5a469b2e5896c0b1ee264ae39f1e27001f2fe 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -100,6 +100,7 @@
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="8sp"
+                                android:baselineAligned="false"
                                 android:orientation="horizontal"
                                 android:weightSum="1">
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c61c01a87cbc090d30ee7ce49e320419f9318baf..bf2050357d9e0f571b01e0fad5730e53fad8f014 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -171,7 +171,7 @@
     <string name="account_status_incompatible_client">Incompatible client</string>
     <string name="account_status_stream_error">Stream error</string>
     <string name="account_status_stream_opening_error">Stream opening error</string>
-    <string name="account_status_channel_binding">Channel binding unavailable</string>
+    <string name="account_status_channel_binding">No channel binding</string>
     <string name="encryption_choice_unencrypted">Clear text</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>