diff --git a/app/src/main/java/org/linphone/LinphoneActivity.java b/app/src/main/java/org/linphone/LinphoneActivity.java
index 2f6051616..b9b6b24b9 100644
--- a/app/src/main/java/org/linphone/LinphoneActivity.java
+++ b/app/src/main/java/org/linphone/LinphoneActivity.java
@@ -972,7 +972,7 @@ public class LinphoneActivity extends LinphoneGenericActivity implements OnClick
             missedChats.clearAnimation();
             missedChats.setVisibility(View.GONE);
         }
-        if (currentFragment == FragmentsAvailable.CHAT_LIST) {
+        if (currentFragment == FragmentsAvailable.CHAT_LIST && fragment != null && fragment instanceof ChatRoomsFragment) {
             ((ChatRoomsFragment)fragment).invalidate();
         }
     }
diff --git a/app/src/main/java/org/linphone/fragments/AboutFragment.java b/app/src/main/java/org/linphone/fragments/AboutFragment.java
index 820a23430..841e285a9 100644
--- a/app/src/main/java/org/linphone/fragments/AboutFragment.java
+++ b/app/src/main/java/org/linphone/fragments/AboutFragment.java
@@ -59,7 +59,7 @@ public class AboutFragment extends Fragment implements OnClickListener {
         TextView aboutVersion = view.findViewById(R.id.about_android_version);
         TextView aboutLiblinphoneVersion = view.findViewById(R.id.about_liblinphone_version);
         aboutLiblinphoneVersion.setText(String.format(getString(R.string.about_liblinphone_version), LinphoneManager.getLc().getVersion()));
-        aboutVersion.setText(String.format(getString(R.string.about_version), BuildConfig.VERSION_NAME));
+        aboutVersion.setText(String.format(getString(R.string.about_version), BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")"));
 
         sendLogButton = view.findViewById(R.id.send_log);
         sendLogButton.setOnClickListener(this);