diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81c2d9e1f3278f474f1d0740f469b7b26d74ece9..304fac6d97c9cb00922b127db2e726351c2f52c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Version 2.10.6
+
+* Minor bug fixes
+
 ### Version 2.10.5
 
 * Security: Stop downloading files that exceed advertised file size
diff --git a/build.gradle b/build.gradle
index b7f56b1710106f7fd275a4eb874cd2543e198aaa..2ddad0c096d1dac540ca83211b0073bd6c4313d8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 
@@ -58,7 +58,7 @@ dependencies {
 
     implementation 'androidx.viewpager:viewpager:1.0.0'
 
-    playstoreImplementation('com.google.firebase:firebase-messaging:23.0.2') {
+    playstoreImplementation('com.google.firebase:firebase-messaging:23.0.3') {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -114,6 +114,7 @@ ext {
 }
 
 android {
+    namespace 'eu.siacs.conversations'
     compileSdkVersion 31
 
     defaultConfig {
@@ -273,7 +274,6 @@ android {
         disable 'MissingTranslation', 'InvalidPackage', 'AppCompatResource'
     }
 
-
     android.applicationVariants.all { variant ->
         variant.outputs.each { output ->
             def baseAbiVersionCode = project.ext.abiCodes.get(output.getFilter(com.android.build.OutputFile.ABI))
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4dc267f8bfdc1a00e3edea10a527c9d04c5d4040..e1e2881ba13ca16e30d8684f25e53d3fc5dfa228 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=a8da5b02437a60819cad23e10fc7e9cf32bcb57029d9cb277e26eeff76ce014b
+distributionSha256Sum=c9490e938b221daf0094982288e4038deed954a3f12fb54cbf270ddf4e37d879
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/src/cheogram/AndroidManifest.xml b/src/cheogram/AndroidManifest.xml
index e749a1e0d04cc84045e606246f296140b4b98540..6322360de849f845fccd947c4ec46f7e76bf6d88 100644
--- a/src/cheogram/AndroidManifest.xml
+++ b/src/cheogram/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
 
diff --git a/src/conversations/AndroidManifest.xml b/src/conversations/AndroidManifest.xml
index 62396bed1af27fcdcac16db152115fbd362223ec..bf2297949f60c8fe268877ed4bca753a0b097169 100644
--- a/src/conversations/AndroidManifest.xml
+++ b/src/conversations/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application tools:ignore="GoogleAppIndexingWarning">
         <activity
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index e4cf8fa56dd7e68bc8bf61219509b9269ba90489..81e638547e6c3d6f71221a0d9cd5687e834261bb 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index 5968babfb16764f8d64b10a9878b5ebc5c0347f6..739a54ee6a648606d1fcc534021f248daba9a5d5 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -16,6 +16,7 @@ import java.lang.ref.WeakReference;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
@@ -669,9 +670,8 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
                         message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED &&
                         this.getType() == message.getType() &&
                         this.getSubject() != null &&
-                        //this.getStatus() == message.getStatus() &&
                         isStatusMergeable(this.getStatus(), message.getStatus()) &&
-                        this.getEncryption() == message.getEncryption() &&
+                        isEncryptionMergeable(this.getEncryption(),message.getEncryption()) &&
                         this.getCounterpart() != null &&
                         this.getCounterpart().equals(message.getCounterpart()) &&
                         this.edited() == message.edited() &&
@@ -704,6 +704,12 @@ public class Message extends AbstractEntity implements AvatarService.Avatarable
         );
     }
 
+    private static boolean isEncryptionMergeable(final int a, final int b) {
+        return a == b
+                && Arrays.asList(ENCRYPTION_NONE, ENCRYPTION_DECRYPTED, ENCRYPTION_AXOLOTL)
+                        .contains(a);
+    }
+
     public void setCounterparts(List<MucOptions.User> counterparts) {
         this.counterparts = counterparts;
     }
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 33abf63974502ab763f01d8018056272af97b9a0..8ce0b212d8ed7d47d9289052d53bc89343caf94f 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -4184,7 +4184,7 @@ public class XmppConnectionService extends Service {
     }
 
     public void updateAccountUi() {
-        for (OnAccountUpdate listener : threadSafeList(this.mOnAccountUpdates)) {
+        for (final OnAccountUpdate listener : threadSafeList(this.mOnAccountUpdates)) {
             listener.onAccountUpdate();
         }
     }
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 7021f865ab0190c657fa54eeaef5a5f99b686bfe..7fcb0bbf0abfac0eed3430bcec61b6c3587b127e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -465,6 +465,7 @@
     <string name="download_failed_file_not_found">Scaricamento fallito: file non trovato</string>
     <string name="download_failed_could_not_connect">Scaricamento fallito: impossibile connettersi all\'host</string>
     <string name="download_failed_could_not_write_file">Scaricamento fallito: scrittura del file impossibile</string>
+    <string name="download_failed_invalid_file">Scaricamento fallito: file non valido</string>
     <string name="account_status_tor_unavailable">Rete Tor non disponibile</string>
     <string name="account_status_bind_failure">Bind fallito</string>
     <string name="account_status_host_unknown">Il server non è responsabile per questo dominio</string>
diff --git a/src/playstore/AndroidManifest.xml b/src/playstore/AndroidManifest.xml
index 6e65b581c79664e254f97fea6d7680c9c94673d9..6deb7d2a43c1c65e0332c1a12225bc3c1b1d145b 100644
--- a/src/playstore/AndroidManifest.xml
+++ b/src/playstore/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:tools="http://schemas.android.com/tools"
-    package="eu.siacs.conversations"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application tools:ignore="GoogleAppIndexingWarning">
diff --git a/src/quicksy/AndroidManifest.xml b/src/quicksy/AndroidManifest.xml
index 1c30d2f28ea7ff1266c128bf939f0c159322337f..f82377f0147ae3436d32be99cdd54408edbe5e91 100644
--- a/src/quicksy/AndroidManifest.xml
+++ b/src/quicksy/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="eu.siacs.conversations">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:icon="@mipmap/new_launcher"