diff --git a/app/build.gradle b/app/build.gradle
index 07b33bb59..9bc8ffadf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 4124
+        versionCode 4126
         versionName "${project.version}"
         applicationId getPackageName()
         multiDexEnabled true
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3aba5d92f..b130588a6 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -68,11 +68,11 @@
         <activity
             android:name=".activities.LinphoneLauncherActivity"
             android:noHistory="true">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
 
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
         </activity>
 
         <!-- Main activities -->
diff --git a/app/src/main/java/org/linphone/activities/DialerActivity.java b/app/src/main/java/org/linphone/activities/DialerActivity.java
index be567d02f..e8c0bb056 100644
--- a/app/src/main/java/org/linphone/activities/DialerActivity.java
+++ b/app/src/main/java/org/linphone/activities/DialerActivity.java
@@ -150,13 +150,15 @@ public class DialerActivity extends MainActivity implements AddressText.AddressC
 
     @Override
     protected void onDestroy() {
-        mAddress = null;
-        mStartCall = null;
-        mAddCall = null;
-        mTransferCall = null;
-        mAddContact = null;
-        mBackToCall = null;
-        mListener = null;
+        if (mInterfaceLoaded) {
+            mAddress = null;
+            mStartCall = null;
+            mAddCall = null;
+            mTransferCall = null;
+            mAddContact = null;
+            mBackToCall = null;
+        }
+        if (mListener != null) mListener = null;
 
         super.onDestroy();
     }
diff --git a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
index 0a9b56af3..2a7fe4acc 100644
--- a/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
+++ b/app/src/main/java/org/linphone/chat/ChatMessagesFragment.java
@@ -959,6 +959,13 @@ public class ChatMessagesFragment extends Fragment
 
     private void pickFile() {
         List<Intent> cameraIntents = new ArrayList<>();
+
+        // Handles image & video picking
+        Intent galleryIntent = new Intent(Intent.ACTION_PICK);
+        galleryIntent.setType("*/*");
+        galleryIntent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {"image/*", "video/*"});
+
+        // Allows to capture directly from the camera
         Intent captureIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
         File file =
                 new File(
@@ -969,13 +976,9 @@ public class ChatMessagesFragment extends Fragment
         captureIntent.putExtra(MediaStore.EXTRA_OUTPUT, mImageToUploadUri);
         cameraIntents.add(captureIntent);
 
-        Intent galleryIntent = new Intent();
-        galleryIntent.setType("image/*");
-        galleryIntent.setAction(Intent.ACTION_PICK);
-
-        Intent fileIntent = new Intent();
+        // Finally allow any kind of file
+        Intent fileIntent = new Intent(Intent.ACTION_GET_CONTENT);
         fileIntent.setType("*/*");
-        fileIntent.setAction(Intent.ACTION_GET_CONTENT);
         cameraIntents.add(fileIntent);
 
         Intent chooserIntent =