diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index 4bbec2de432438c1019c8fd7b4900570d4ff7312..99e1dc55f22a27f2bd4024fc12f0a9d827603b24 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -151,21 +151,17 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
         // Locate the button in activity_main.xml
         button = findViewById(R.id.MailBtn);//MailBtn
         button.setOnLongClickListener(new View.OnLongClickListener() {
-
             @Override
             public boolean onLongClick(View v) {
                 showMailInfo();
                 return true;
             }
         });
-
-        // Capture button clicks
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View arg0) {
-                // Start NewActivity.class
                 String k9 = "com.fsck.k9";
                 Intent mail = getPackageManager().getLaunchIntentForPackage(k9);
-                if(mail == null&&(firstStart.getBoolean("firsttap", false))) {
+                if(mail == null) {
                     mail = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+k9));
                 }//first time tap check
                 if (firstStart.getBoolean("firsttap", true)){
@@ -174,8 +170,10 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
                 }
                 else startActivity(mail);
             }
+
         });
 
+
         button = findViewById(R.id.CloudBtn);//CloudBtn
         button.setOnLongClickListener(new View.OnLongClickListener() {
             @Override
diff --git a/app/src/main/res/xml/changelog_master.xml b/app/src/main/res/xml/changelog_master.xml
index 7f786fefee24e4ed9e3c7207a16eeae913760714..5bd0899977823ef4aa080d79b2cb4a833eea7e79 100644
--- a/app/src/main/res/xml/changelog_master.xml
+++ b/app/src/main/res/xml/changelog_master.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <changelog>
     <release version="0.9.2" versioncode="7" >
+        <change>Fixed app crash on tapping mail icon</change>
         <change>Fixed first time asking xmpp client</change>
         <change>Italian translation added</change>
         <change>fixed Spanish typos</change>