diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/FingerprintController.java b/TMessagesProj/src/main/java/org/telegram/messenger/FingerprintController.java
index ac56341e6..76680f4e3 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/FingerprintController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/FingerprintController.java
@@ -110,7 +110,10 @@ public static void checkKeyReady(boolean notifyCheckFingerprint) {
 
     public static boolean isKeyReady() {
         try {
-            return getKeyStore().containsAlias(KEY_ALIAS);
+            var ks = getKeyStore();
+            if (ks != null) {
+                return ks.containsAlias(KEY_ALIAS);
+            }
         } catch (KeyStoreException e) {
             FileLog.e(e);
         }
diff --git a/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java b/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
index 46b33f42b..a52c4c6ed 100644
--- a/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
+++ b/TMessagesProj/src/main/java/org/telegram/messenger/MediaController.java
@@ -4526,7 +4526,7 @@ SaveToDownloadReceiver. makeNotification(context,notificationId,messageObjects.s
                                 break;
                             }
                             if (!sourceFile.exists()) {
-                                sourceFile = FileLoader.getInstance(currentAccount.getCurrentAccount()).getPathToAttach(message.messageOwner, true);
+                                sourceFile = FileLoader.getInstance(currentAccount.getCurrentAccount()).getPathToMessage(message.messageOwner);
                                 FileLog.d("saving file: correcting path from " + path + " to " + (sourceFile == null ? null : sourceFile.getAbsolutePath()));
                             }
                             if (sourceFile != null && sourceFile.exists()) {
diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
index 7a80cef04..98c9d1f7d 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java
@@ -5996,15 +5996,14 @@ public boolean didSelectDialogs(DialogsActivity dialogsFragment, ArrayList<Messa
                             ArrayList<String> arrayList = new ArrayList<>();
                             arrayList.add(videoPath);
                             SendMessagesHelper.prepareSendingDocuments(accountInstance, arrayList, arrayList, null, captionToSend, null, did, replyToMsg, replyToMsg, null, null, null, notify, scheduleDate, null, null, 0, 0, false);
+                        } else if (photoPathsArray != null && photoPathsArray.size() > 0 && !photosEditorOpened) {
+                            if (sendingText != null && sendingText.length() <= 1024 && photoPathsArray.size() == 1) {
+                                photoPathsArray.get(0).caption = sendingText;
+                                sendingText = null;
+                            }
+                            SendMessagesHelper.prepareSendingMedia(accountInstance, photoPathsArray, did, replyToMsg, replyToMsg, null, null, false, false, null, notify, scheduleDate, 0, false, null, null, 0, 0, false);
                         }
                     }
-                    if (photoPathsArray != null && !photosEditorOpened) {
-                        if (sendingText != null && sendingText.length() <= 1024 && photoPathsArray.size() == 1) {
-                            photoPathsArray.get(0).caption = sendingText;
-                            sendingText = null;
-                        }
-                        SendMessagesHelper.prepareSendingMedia(accountInstance, photoPathsArray, did, replyToMsg, replyToMsg, null, null, false, false, null, notify, scheduleDate, 0, false, null, null, 0, 0, false);
-                    }
                     if (documentsPathsArray != null || documentsUrisArray != null) {
                         if (sendingText != null && sendingText.length() <= 1024 && ((documentsPathsArray != null ? documentsPathsArray.size() : 0) + (documentsUrisArray != null ? documentsUrisArray.size() : 0)) == 1) {
                             captionToSend = sendingText;