diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index c106bf42b012a5f97ef2433db9a2fa0402ece908..f231cc4d598f5eb350c09c1cbcb222ceea1bc3fd 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -100,6 +100,7 @@ public final class Config {
     public static final boolean REMOVE_BROKEN_DEVICES = false;
     public static final boolean OMEMO_PADDING = false;
     public static final boolean PUT_AUTH_TAG_INTO_KEY = true;
+    public static final boolean TWELVE_BYTE_IV = false;
 
     public static final boolean USE_BOOKMARKS2 = false;
 
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
index 853dc4babd15f5504374a11fce70070fa70679ec..5a85e11574025617c64f9bd301fe543ae3f80a2b 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java
@@ -165,8 +165,8 @@ public class XmppAxolotlMessage {
 	}
 
 	private static byte[] generateIv() {
-		SecureRandom random = new SecureRandom();
-		byte[] iv = new byte[16];
+		final SecureRandom random = new SecureRandom();
+		byte[] iv = new byte[Config.TWELVE_BYTE_IV ? 12 : 16];
 		random.nextBytes(iv);
 		return iv;
 	}
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index daa0c20c789a16098710b4c59307745caa6bb000..08fae1bc5f54beba63e2cfc26e3fccfc1d456306 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -109,7 +109,7 @@ public class HttpUploadConnection implements Transferable {
 		if (Config.ENCRYPT_ON_HTTP_UPLOADED
 				|| message.getEncryption() == Message.ENCRYPTION_AXOLOTL
 				|| message.getEncryption() == Message.ENCRYPTION_OTR) {
-			this.key = new byte[48];
+			this.key = new byte[Config.TWELVE_BYTE_IV ? 44 : 48];
 			mXmppConnectionService.getRNG().nextBytes(this.key);
 			this.file.setKeyAndIv(this.key);
 		}
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index c09fcb19524b25e606b752a6af2254a9c848dee9..25f65303800ee719b76ae22989b191ea72a869db 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -657,7 +657,6 @@
   <string name="pref_more_notification_settings_summary">الأهمية ، الصوت ، الإهتزاز</string>
   <string name="video_compression_channel_name">ضغط الفيديو</string>
   <string name="view_media">اعرض الوسائط</string>
-  <string name="view_users">اعرض المشارِكين</string>
   <string name="group_chat_members">المشارِكون</string>
   <string name="pref_video_compression">جودة الفيديو</string>
   <string name="video_360p">متوسط (360ب)</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index a1076e8f2d3a3c953a6f2f0cb2551b47947ced80..9c2822015ee2bf275dd34cbb101f27799af24ad9 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Wichtigkeit, Klang, Vibrationen</string>
   <string name="video_compression_channel_name">Video komprimieren</string>
   <string name="view_media">Medien anzeigen</string>
-  <string name="view_users">Teilnehmer anzeigen</string>
   <string name="group_chat_members">Teilnehmer</string>
   <string name="media_browser">Medienbrowser</string>
   <string name="security_violation_not_attaching_file">Datei wurde aufgrund von Sicherheitsverletzungen ausgelassen.</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 8395311acb40c49e270d9696ea1a39bfa272af07..2453932b2c41acc8be6fec88e1f2f1ef5b440d7d 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -747,7 +747,6 @@
   <string name="pref_more_notification_settings_summary">Σημασία, Ήχος, Δόνηση</string>
   <string name="video_compression_channel_name">Συμπίεση βίντεο</string>
   <string name="view_media">Εμφάνιση μέσου</string>
-  <string name="view_users">Εμφάνιση συμμετεχόντων</string>
   <string name="group_chat_members">Συμμετέχοντες</string>
   <string name="media_browser">Περιηγητης μέσων</string>
   <string name="security_violation_not_attaching_file">Το αρχείο παραλείπεται λόγω παραβίασης ασφάλειας.</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 02fd7f85522f9779e3ada34fed50acc2305908f3..9ef58cda84a790f81f4a992b54aca5f4a3c27054 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Importancia, Sonido, Vibración</string>
   <string name="video_compression_channel_name">Compresión de video</string>
   <string name="view_media">Ver galería</string>
-  <string name="view_users">Ver participantes</string>
   <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Galería</string>
   <string name="security_violation_not_attaching_file">Fichero omitido por violación de seguridad</string>
diff --git a/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 247d0e13a9194cd506f6bfcbe3f043662e688f04..6366f38090adc74d3f2a69dbbb18c368834d98f0 100644
--- a/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
@@ -746,7 +746,6 @@
   <string name="pref_more_notification_settings_summary">Garrantzia, soinua, dardara</string>
   <string name="video_compression_channel_name">Bideoen konprimatzea</string>
   <string name="view_media">Ikusi multimedia</string>
-  <string name="view_users">Parte-hartzaileak ikusi</string>
   <string name="group_chat_members">Parte-hartzaileak</string>
   <string name="media_browser">Multimedia nabigatzailea</string>
   <string name="security_violation_not_attaching_file">Fitxategia alde batera utzita segurtasun hauste bategatik.</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 5cbaa6e6976e02d9c7b06a6bb903befa55d228f0..aeadabaf273ff6b1df87c8d703800e33057fb6f2 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -749,7 +749,6 @@
   <string name="pref_more_notification_settings_summary">Importance, son, vibration</string>
   <string name="video_compression_channel_name">Compression vidéo</string>
   <string name="view_media">Voir les média</string>
-  <string name="view_users">Voir les participants</string>
   <string name="group_chat_members">Participants</string>
   <string name="media_browser">Navigateur de média</string>
   <string name="security_violation_not_attaching_file">Fichier omis en raison d\'une violation de la sécurité.</string>
diff --git a/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 53cb075e54bcfceb48e849555a97132b95cdeec7..c2685112109312f44159d78d31fe3bb4e341f512 100644
--- a/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Importancia, Son, Vibrar</string>
   <string name="video_compression_channel_name">Compresión de vídeo</string>
   <string name="view_media">Ver medios</string>
-  <string name="view_users">Ver participantes</string>
   <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Navegador de medios</string>
   <string name="security_violation_not_attaching_file">Ficheiro omitido debido a transgresión da seguridade.</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 44adbbc1f24cf9234906866e6cd5ba2fecff16df..7dd041b14d536f64c623173f8a4eab51d20a1952 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Fontosság, hang, rezgés</string>
   <string name="video_compression_channel_name">Videó tömörítése</string>
   <string name="view_media">Média megtekintése</string>
-  <string name="view_users">Résztvevők megtekintése</string>
   <string name="group_chat_members">Résztvevők</string>
   <string name="media_browser">Médiaböngésző</string>
   <string name="security_violation_not_attaching_file">A fájl ki lett hagyva a biztonság megsértése miatt.</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 105179733a91c78142d6abccd59870fdcc80c81b..2f46b3017294f9f0989c6aa81cb5a1ecfa1712b3 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Importanza, suono, vibrazione</string>
   <string name="video_compression_channel_name">Compressione video</string>
   <string name="view_media">Vedi i media</string>
-  <string name="view_users">Vedi i partecipanti</string>
   <string name="group_chat_members">Partecipanti</string>
   <string name="media_browser">Browser multimediale</string>
   <string name="security_violation_not_attaching_file">File omesso per violazione di sicurezza.</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index bf7da93722bff7940507f1e45e45e8db9ef4cf79..3f2dcb4db3363590f34b12c430179d9a69569447 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -748,7 +748,6 @@
   <string name="pref_more_notification_settings_summary">Belang, geluid, trillen</string>
   <string name="video_compression_channel_name">Videocompressie</string>
   <string name="view_media">Media bekijken</string>
-  <string name="view_users">Deelnemers bekijken</string>
   <string name="group_chat_members">Deelnemers</string>
   <string name="media_browser">Mediabrowser</string>
   <string name="security_violation_not_attaching_file">Bestand weggelaten wegens beveiligingsovertreding.</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 797bc1fca51b42d125a191eb35fada217dd7e4be..cb386b42791505d776e88295cdcbcdb93e7fac76 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -769,7 +769,6 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="pref_more_notification_settings_summary">Ważność, Dźwięk, Wibracja</string>
   <string name="video_compression_channel_name">Kompresja wideo</string>
   <string name="view_media">Pokaż media</string>
-  <string name="view_users">Pokaż członków</string>
   <string name="group_chat_members">Uczestnicy</string>
   <string name="media_browser">Przeglądarka mediów</string>
   <string name="security_violation_not_attaching_file">Plik pominięty w związku z naruszeniem bezpieczeństwa.</string>
@@ -898,4 +897,11 @@ Administrator twojego serwera będzie mógł czytać twoje wiadomości, ale moż
   <string name="pref_channel_discovery">Metoda odkrywania kanałów</string>
   <string name="backup">Kopia zapasowa</string>
   <string name="category_about">O aplikacji</string>
+  <plurals name="view_users">
+    <item quantity="one">Pokaż %1$d uczestnika</item>
+    <item quantity="few">Pokaż %1$d uczestników</item>
+    <item quantity="many">Pokaż %1$d uczestników</item>
+    <item quantity="other">Pokaż %1$d uczestników</item>
+  </plurals>
+  <string name="openstreetmap_credit">© autorzy <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> </string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 9e502563eeaf0477daa0b043e982a7287071892f..f91a0a4b2108677aed55c767ef0773efc213048b 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -751,7 +751,6 @@
   <string name="pref_more_notification_settings_summary">Importância, som, vibração.</string>
   <string name="video_compression_channel_name">Compressão de vídeo</string>
   <string name="view_media">Ver mídia</string>
-  <string name="view_users">Ver participantes</string>
   <string name="group_chat_members">Participantes</string>
   <string name="media_browser">Navegador de mídia</string>
   <string name="security_violation_not_attaching_file">Arquivo omitido devido a violação de segurança</string>
diff --git a/src/main/res/values-ro-rRO/strings.xml b/src/main/res/values-ro-rRO/strings.xml
index 129966633f227af1f4fde05d0c11323a4e4db1c8..21b92b5c5df01333070c6ce960ac01c8f0e42cbb 100644
--- a/src/main/res/values-ro-rRO/strings.xml
+++ b/src/main/res/values-ro-rRO/strings.xml
@@ -761,7 +761,6 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="pref_more_notification_settings_summary">Importanță, sunete, vibrații</string>
   <string name="video_compression_channel_name">Compresie video</string>
   <string name="view_media">Vizualizare fișiere media</string>
-  <string name="view_users">Arată participanții</string>
   <string name="group_chat_members">Participanți</string>
   <string name="media_browser">Vizualizare fișiere media</string>
   <string name="security_violation_not_attaching_file">Fișier omis ca urmare a unei probleme de securitate.</string>
@@ -890,4 +889,10 @@ sau chiar pierderea mesajelor.\nÎn continuare veți fi rugați să dezactivați
   <string name="pref_channel_discovery">Metoda de descoperire a canalelor</string>
   <string name="backup">Copie de siguranță</string>
   <string name="category_about">Despre</string>
+  <plurals name="view_users">
+    <item quantity="one">Arată %1$d participant</item>
+    <item quantity="few">Arată %1$d participanți</item>
+    <item quantity="other">Arată %1$d de participanți</item>
+  </plurals>
+  <string name="openstreetmap_credit">© Colaboratorii <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a></string>
 </resources>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 8750b4860009759c1ec649bee4b615973a53bfbb..1c8b2e7621c60961c88b81cf353ae4462cfd6fa7 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -761,7 +761,6 @@
   <string name="pref_more_notification_settings_summary">Важливість, звук, вібрація</string>
   <string name="video_compression_channel_name">Стиснення відео</string>
   <string name="view_media">Перегляд медіа</string>
-  <string name="view_users">Переглянути учасників</string>
   <string name="group_chat_members">Учасники</string>
   <string name="media_browser">Переглядач медіа</string>
   <string name="security_violation_not_attaching_file">Файл пропущено через порушення безпеки.</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 85a37fe86b3d229bdd3997f81d466bf4beb5c8c2..0bb284ed2fd47849d1b2782c0e0814beaa6707da 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -740,7 +740,6 @@
   <string name="pref_more_notification_settings_summary">重要性，声音，振动</string>
   <string name="video_compression_channel_name">视频压缩</string>
   <string name="view_media">查看媒体文件</string>
-  <string name="view_users">查看成员</string>
   <string name="group_chat_members">成员</string>
   <string name="media_browser">媒体浏览器</string>
   <string name="security_violation_not_attaching_file">文件由于违反安全策略而被删除。</string>