diff --git a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
index 3865f3605..8ad8fd36b 100644
--- a/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -122,9 +122,15 @@ public class RegistrationActivity extends BaseActionBarActivity implements DcEve
             startActivity(new Intent(this, ProxySettingsActivity.class));
         });
 
+        boolean isChatmail = DcHelper.getContext(getApplicationContext()).isChatmail();
+
+        findViewById(R.id.no_servers_hint).setVisibility(isChatmail? View.GONE : View.VISIBLE);
+
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) {
-            actionBar.setTitle(R.string.manual_account_setup_option);
+            actionBar.setTitle(
+              isChatmail? R.string.pref_password_and_account_settings : R.string.manual_account_setup_option
+            );
             actionBar.setDisplayHomeAsUpEnabled(true);
             actionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp);
             actionBar.setElevation(0); // TODO: use custom toolbar instead