1 files changed, 6 insertions, 8 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index eaefb1fa2..aa7407c32 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -58,29 +58,28 @@ public class SettingsActivity extends XmppActivity implements
     public static final String USE_MULTI_ACCOUNTS = "use_multi_accounts";
 
     public static final int REQUEST_WRITE_LOGS = 0xbf8701;
-    private SettingsFragment mSettingsFragment;
-
     Preference multiAccountPreference;
     Preference BundledEmojiPreference;
-
     boolean isMultiAccountChecked = false;
     boolean isBundledEmojiChecked;
+    private SettingsFragment mSettingsFragment;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
         FragmentManager fm = getFragmentManager();
-        mSettingsFragment = (SettingsFragment) fm.findFragmentById(android.R.id.content);
+        mSettingsFragment = (SettingsFragment) fm.findFragmentById(R.id.settings_content);
         if (mSettingsFragment == null || !mSettingsFragment.getClass().equals(SettingsFragment.class)) {
             mSettingsFragment = new SettingsFragment();
-            fm.beginTransaction().replace(android.R.id.content, mSettingsFragment).commit();
+            fm.beginTransaction().replace(R.id.settings_content, mSettingsFragment).commit();
         }
         mSettingsFragment.setActivityIntent(getIntent());
-
         this.mTheme = findTheme();
         setTheme(this.mTheme);
-
         getWindow().getDecorView().setBackgroundColor(Color.get(this, R.attr.color_background_primary));
+        setSupportActionBar(findViewById(R.id.toolbar));
+        configureActionBar(getSupportActionBar());
     }
 
     @Override
@@ -434,7 +433,6 @@ public class SettingsActivity extends XmppActivity implements
     }
 
 
-
     @Override
     public void onStop() {
         super.onStop();