diff --git a/app/build.gradle b/app/build.gradle
index 4626981308d..c1cfa86b747 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,8 +61,8 @@ protobuf {
     }
 }
 
-def canonicalVersionCode = 788
-def canonicalVersionName = "5.4.2"
+def canonicalVersionCode = 790
+def canonicalVersionName = "5.4.4"
 
 def postFixSize = 100
 def abiPostFix = ['universal'   : 0,
@@ -335,7 +335,7 @@ dependencies {
     implementation project(':video')
 
     implementation 'org.signal:zkgroup-android:0.7.0'
-    implementation 'org.whispersystems:signal-client-android:0.2.3'
+    implementation 'org.whispersystems:signal-client-android:0.1.5'
     implementation 'com.google.protobuf:protobuf-javalite:3.10.0'
     implementation 'org.signal:argon2:13.1@aar'
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
index 08036f53f31..694563f0f51 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
@@ -124,6 +124,7 @@ public void onCreate() {
                                 Log.i(TAG, "onCreate()");
                             })
                             .addBlocking("crash-handling", this::initializeCrashHandling)
+                            .addBlocking("notification-channels", () -> NotificationChannels.create(this))
                             .addBlocking("eat-db", () -> DatabaseFactory.getInstance(this))
                             .addBlocking("app-dependencies", this::initializeAppDependencies)
                             .addBlocking("first-launch", this::initializeFirstEverAppLaunch)
@@ -158,7 +159,6 @@ public void onCreate() {
                             .addNonBlocking(() -> ApplicationDependencies.getJobManager().beginJobLoop())
                             .addPostRender(this::initializeExpiringMessageManager)
                             .addPostRender(this::initializeBlobProvider)
-                            .addPostRender(() -> NotificationChannels.create(this))
                             .execute();
 
     Log.d(TAG, "onCreate() took " + (System.currentTimeMillis() - startTime) + " ms");
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
index d3e0340f5e0..d0b790e9f5f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -40,8 +40,12 @@ public class ZoomingImageView extends FrameLayout {
   private static final int ZOOM_TRANSITION_DURATION = 300;
 
   private static final float ZOOM_LEVEL_MIN = 1.0f;
-  private static final float ZOOM_LEVEL_MID = 1.5f;
-  private static final float ZOOM_LEVEL_MAX = 2.0f;
+
+  private static final float LARGE_IMAGES_ZOOM_LEVEL_MID = 1.5f;
+  private static final float LARGE_IMAGES_ZOOM_LEVEL_MAX = 2.0f;
+
+  private static final float SMALL_IMAGES_ZOOM_LEVEL_MID = 3.0f;
+  private static final float SMALL_IMAGES_ZOOM_LEVEL_MAX = 8.0f;
 
   private final PhotoView                 photoView;
   private final SubsamplingScaleImageView subsamplingImageView;
@@ -65,10 +69,11 @@ public ZoomingImageView(Context context, AttributeSet attrs, int defStyleAttr) {
     this.subsamplingImageView.setOrientation(SubsamplingScaleImageView.ORIENTATION_USE_EXIF);
 
     this.photoView.setZoomTransitionDuration(ZOOM_TRANSITION_DURATION);
-    this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, ZOOM_LEVEL_MID, ZOOM_LEVEL_MAX);
+    this.photoView.setScaleLevels(ZOOM_LEVEL_MIN, SMALL_IMAGES_ZOOM_LEVEL_MID, SMALL_IMAGES_ZOOM_LEVEL_MAX);
 
     this.subsamplingImageView.setDoubleTapZoomDuration(ZOOM_TRANSITION_DURATION);
-    this.subsamplingImageView.setDoubleTapZoomScale(ZOOM_LEVEL_MID);
+    this.subsamplingImageView.setDoubleTapZoomScale(LARGE_IMAGES_ZOOM_LEVEL_MID);
+    this.subsamplingImageView.setMaxScale(LARGE_IMAGES_ZOOM_LEVEL_MAX);
 
     this.photoView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
     this.subsamplingImageView.setOnClickListener(v -> ZoomingImageView.this.callOnClick());
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 2b0a7fbcb14..d8677714950 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -2003,7 +2003,9 @@ private void updateWallpaper(@Nullable ChatWallpaper chatWallpaper) {
 
       int toolbarColor = getResources().getColor(R.color.conversation_toolbar_color_wallpaper);
       toolbar.setBackgroundColor(toolbarColor);
-      WindowUtil.setStatusBarColor(getWindow(), toolbarColor);
+      if (Build.VERSION.SDK_INT > 21) {
+        WindowUtil.setStatusBarColor(getWindow(), toolbarColor);
+      }
     } else {
       wallpaper.setImageDrawable(null);
       wallpaperDim.setVisibility(View.GONE);
@@ -2014,7 +2016,9 @@ private void updateWallpaper(@Nullable ChatWallpaper chatWallpaper) {
 
       int toolbarColor = getResources().getColor(R.color.conversation_toolbar_color);
       toolbar.setBackgroundColor(toolbarColor);
-      WindowUtil.setStatusBarColor(getWindow(), toolbarColor);
+      if (Build.VERSION.SDK_INT > 21) {
+        WindowUtil.setStatusBarColor(getWindow(), toolbarColor);
+      }
     }
     fragment.onWallpaperChanged(chatWallpaper);
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
index 66c6154eb70..b9191e27ea3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationReactionOverlay.java
@@ -144,6 +144,41 @@ public void setListVerticalTranslation(float translationY) {
     maskView.setTargetParentTranslationY(translationY);
   }
 
+  private OnLayoutChangeListener createUpdateViewPositionsOnLayoutChangeListener(@NonNull View maskTarget,
+                                                                                 int maskPaddingBottom,
+                                                                                 @NonNull PointF lastSeenDownPoint)
+  {
+    return new OnLayoutChangeListener() {
+      @Override
+      public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+
+        final float scrubberTranslationY = Math.max(-scrubberDistanceFromTouchDown + actionBarHeight,
+                                                    lastSeenDownPoint.y - scrubberHeight - scrubberDistanceFromTouchDown - statusBarHeight);
+
+        final float halfWidth            = scrubberWidth / 2f + scrubberHorizontalMargin;
+        final float screenWidth          = getResources().getDisplayMetrics().widthPixels;
+        final float downX                = ViewUtil.isLtr(ConversationReactionOverlay.this) ? lastSeenDownPoint.x : screenWidth - lastSeenDownPoint.x;
+        final float scrubberTranslationX = Util.clamp(downX - halfWidth,
+                                                      scrubberHorizontalMargin,
+                                                      screenWidth + scrubberHorizontalMargin - halfWidth * 2) * (ViewUtil.isLtr(ConversationReactionOverlay.this) ? 1 : -1);
+
+        backgroundView.setTranslationX(scrubberTranslationX);
+        backgroundView.setTranslationY(scrubberTranslationY);
+
+        foregroundView.setTranslationX(scrubberTranslationX);
+        foregroundView.setTranslationY(scrubberTranslationY);
+
+        verticalScrubBoundary.update(lastSeenDownPoint.y - distanceFromTouchDownPointToTopOfScrubberDeadZone,
+                                     lastSeenDownPoint.y + distanceFromTouchDownPointToBottomOfScrubberDeadZone);
+
+        maskView.setPadding(0, 0, 0, maskPaddingBottom);
+        maskView.setTarget(maskTarget);
+
+        removeOnLayoutChangeListener(this);
+      }
+    };
+  }
+
   public void show(@NonNull Activity activity,
                    @NonNull View maskTarget,
                    @NonNull Recipient conversationRecipient,
@@ -171,27 +206,7 @@ public void show(@NonNull Activity activity,
       statusBarHeight = ViewUtil.getStatusBarHeight(this);
     }
 
-    final float scrubberTranslationY = Math.max(-scrubberDistanceFromTouchDown + actionBarHeight,
-                                                lastSeenDownPoint.y - scrubberHeight - scrubberDistanceFromTouchDown - statusBarHeight);
-
-    final float halfWidth            = scrubberWidth / 2f + scrubberHorizontalMargin;
-    final float screenWidth          = getResources().getDisplayMetrics().widthPixels;
-    final float downX                = ViewUtil.isLtr(this) ? lastSeenDownPoint.x : screenWidth - lastSeenDownPoint.x;
-    final float scrubberTranslationX = Util.clamp(downX - halfWidth,
-                                                  scrubberHorizontalMargin,
-                                                  screenWidth + scrubberHorizontalMargin - halfWidth * 2) * (ViewUtil.isLtr(this) ? 1 : -1);
-
-    backgroundView.setTranslationX(scrubberTranslationX);
-    backgroundView.setTranslationY(scrubberTranslationY);
-
-    foregroundView.setTranslationX(scrubberTranslationX);
-    foregroundView.setTranslationY(scrubberTranslationY);
-
-    verticalScrubBoundary.update(lastSeenDownPoint.y - distanceFromTouchDownPointToTopOfScrubberDeadZone,
-                                 lastSeenDownPoint.y + distanceFromTouchDownPointToBottomOfScrubberDeadZone);
-
-    maskView.setPadding(0, 0, 0, maskPaddingBottom);
-    maskView.setTarget(maskTarget);
+    addOnLayoutChangeListener(createUpdateViewPositionsOnLayoutChangeListener(maskTarget, maskPaddingBottom, lastSeenDownPoint));
 
     hideAnimatorSet.end();
     toolbar.setVisibility(VISIBLE);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
index 267c02f805c..f06edd332fc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
@@ -60,8 +60,8 @@ public boolean containsSession(SignalProtocolAddress address) {
         SessionRecord sessionRecord = DatabaseFactory.getSessionDatabase(context).load(recipientId, address.getDeviceId());
 
         return sessionRecord != null &&
-               sessionRecord.hasSenderChain() &&
-               sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
+               sessionRecord.getSessionState().hasSenderChain() &&
+               sessionRecord.getSessionState().getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
       } else {
         return false;
       }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
index db106c45b90..6fcec92c8e5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SessionStoreMigrationHelper.java
@@ -10,6 +10,7 @@
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.SessionDatabase;
 import org.whispersystems.libsignal.state.SessionRecord;
+import org.whispersystems.libsignal.state.SessionState;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
 import java.io.File;
@@ -63,7 +64,9 @@ static void migrateSessions(Context context, SQLiteDatabase database) {
 
             if (versionMarker == SINGLE_STATE_VERSION) {
               Log.i(TAG, "Migrating single state version: " + sessionFile.getAbsolutePath());
-              sessionRecord = SessionRecord.fromSingleSessionState(serialized);
+              SessionState sessionState = new SessionState(serialized);
+
+              sessionRecord = new SessionRecord(sessionState);
             } else if (versionMarker >= ARCHIVE_STATES_VERSION) {
               Log.i(TAG, "Migrating session: " + sessionFile.getAbsolutePath());
               sessionRecord = new SessionRecord(serialized);
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInitiationBottomSheetDialogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInitiationBottomSheetDialogFragment.java
index 1afe479bbb6..7e0447ccc96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInitiationBottomSheetDialogFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationInitiationBottomSheetDialogFragment.java
@@ -21,6 +21,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.BottomSheetUtil;
 import org.thoughtcrime.securesms.util.ThemeUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 /**
@@ -38,6 +39,8 @@ public final class GroupsV1MigrationInitiationBottomSheetDialogFragment extends
   private GroupMemberListView                  ineligibleList;
   private TextView                             ineligibleTitle;
   private View                                 ineligibleContainer;
+  private View                                 upgradeButton;
+  private View                                 spinner;
 
   public static void showForInitiation(@NonNull FragmentManager manager, @NonNull RecipientId groupRecipientId) {
     Bundle args = new Bundle();
@@ -71,6 +74,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     this.ineligibleContainer = view.findViewById(R.id.gv1_migrate_ineligible_container);
     this.ineligibleTitle     = view.findViewById(R.id.gv1_migrate_ineligible_title);
     this.ineligibleList      = view.findViewById(R.id.gv1_migrate_ineligible_list);
+    this.upgradeButton       = view.findViewById(R.id.gv1_migrate_upgrade_button);
+    this.spinner             = view.findViewById(R.id.gv1_migrate_spinner);
 
     inviteList.setNestedScrollingEnabled(false);
     ineligibleList.setNestedScrollingEnabled(false);
@@ -82,8 +87,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
     viewModel = ViewModelProviders.of(this, new GroupsV1MigrationInitiationViewModel.Factory(groupRecipientId)).get(GroupsV1MigrationInitiationViewModel.class);
     viewModel.getMigrationState().observe(getViewLifecycleOwner(), this::onMigrationStateChanged);
 
+    upgradeButton.setEnabled(false);
+    upgradeButton.setOnClickListener(v -> onUpgradeClicked());
     view.findViewById(R.id.gv1_migrate_cancel_button).setOnClickListener(v -> dismiss());
-    view.findViewById(R.id.gv1_migrate_upgrade_button).setOnClickListener(v -> onUpgradeClicked());
   }
 
   @Override
@@ -107,6 +113,9 @@ private void onMigrationStateChanged(@NonNull MigrationState migrationState) {
     } else {
       ineligibleContainer.setVisibility(View.GONE);
     }
+
+    upgradeButton.setEnabled(true);
+    spinner.setVisibility(View.GONE);
   }
 
   private void onUpgradeClicked() {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationRepository.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationRepository.java
index 9bd0b40ae71..998e93bebfc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationRepository.java
@@ -20,6 +20,7 @@
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.recipients.RecipientUtil;
 import org.thoughtcrime.securesms.transport.RetryLaterException;
+import org.thoughtcrime.securesms.util.Util;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -83,7 +84,11 @@ private MigrationState getMigrationState(@NonNull RecipientId groupRecipientId)
     }
 
     try {
-      RecipientUtil.ensureUuidsAreAvailable(ApplicationDependencies.getApplication(), group.getParticipants());
+      List<Recipient> registered = Stream.of(group.getParticipants())
+                                         .filter(Recipient::isRegistered)
+                                         .toList();
+
+      RecipientUtil.ensureUuidsAreAvailable(ApplicationDependencies.getApplication(), registered);
     } catch (IOException e) {
       Log.w(TAG, "Failed to refresh UUIDs!", e);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/MessageProcessReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/MessageProcessReceiver.java
index e8c32ed1e32..b65ca28828a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/MessageProcessReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/messageprocessingalarm/MessageProcessReceiver.java
@@ -6,6 +6,8 @@
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Handler;
+import android.os.Looper;
 import android.os.SystemClock;
 
 import androidx.annotation.NonNull;
@@ -44,6 +46,8 @@ public void onReceive(@NonNull Context context, @NonNull Intent intent) {
     } else if (BROADCAST_ACTION.equals(intent.getAction())) {
       PendingResult pendingResult = goAsync();
 
+      new Handler(Looper.getMainLooper()).postDelayed(pendingResult::finish, JOB_TIMEOUT);
+
       SignalExecutors.BOUNDED.submit(() -> {
         Log.i(TAG, "Running PushNotificationReceiveJob");
 
@@ -51,8 +55,6 @@ public void onReceive(@NonNull Context context, @NonNull Intent intent) {
                                                                         .runSynchronously(PushNotificationReceiveJob.withDelayedForegroundService(FOREGROUND_DELAY), JOB_TIMEOUT);
 
         Log.i(TAG, "PushNotificationReceiveJob ended: " + (jobState.isPresent() ? jobState.get().toString() : "Job did not complete"));
-
-        pendingResult.finish();
       });
     }
   }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 597452d8971..f702cedc7fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -271,6 +271,10 @@ public void updateNotification(@NonNull Context context,
                                  int      reminderCount,
                                  @NonNull BubbleUtil.BubbleState defaultBubbleState)
   {
+    if (!TextSecurePreferences.isNotificationsEnabled(context)) {
+      return;
+    }
+
     boolean isReminder  = reminderCount > 0;
     Cursor  telcoCursor = null;
     Cursor  pushCursor  = null;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
index 7ca1419c9c2..2a9cb66e3cc 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java
@@ -44,9 +44,10 @@ public class NotificationChannels {
   private static class Version {
     static final int MESSAGES_CATEGORY   = 2;
     static final int CALLS_PRIORITY_BUMP = 3;
+    static final int VIBRATE_OFF_OTHER   = 4;
   }
 
-  private static final int VERSION = 3;
+  private static final int VERSION = 4;
 
   private static final String CATEGORY_MESSAGES = "messages";
   private static final String CONTACT_PREFIX    = "contact_";
@@ -57,7 +58,7 @@ private static class Version {
   public static final String APP_UPDATES   = "app_updates";
   public static final String BACKUPS       = "backups_v2";
   public static final String LOCKED_STATUS = "locked_status_v2";
-  public static final String OTHER         = "other_v2";
+  public static final String OTHER         = "other_v3";
   public static final String VOICE_NOTES   = "voice_notes";
 
   /**
@@ -462,6 +463,8 @@ private static void onCreate(@NonNull Context context, @NonNull NotificationMana
     backups.setShowBadge(false);
     lockedStatus.setShowBadge(false);
     other.setShowBadge(false);
+    other.setVibrationPattern(new long[]{0});
+    other.enableVibration(true);
     voiceNotes.setShowBadge(false);
 
     notificationManager.createNotificationChannels(Arrays.asList(messages, calls, failures, backups, lockedStatus, other, voiceNotes));
@@ -489,6 +492,10 @@ private static void onUpgrade(@NonNull NotificationManager notificationManager,
     if (oldVersion < Version.CALLS_PRIORITY_BUMP) {
       notificationManager.deleteNotificationChannel("calls_v2");
     }
+
+    if (oldVersion < Version.VIBRATE_OFF_OTHER) {
+      notificationManager.deleteNotificationChannel("other_v2");
+    }
   }
 
   @TargetApi(26)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
index db94720f024..a4c45946d4d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/spoofing/ReviewBannerView.java
@@ -8,6 +8,7 @@
 import android.view.View;
 import android.view.ViewOutlineProvider;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
@@ -26,9 +27,7 @@
 /**
  * Banner displayed within a conversation when a review is suggested.
  */
-public class ReviewBannerView extends ConstraintLayout {
-
-  private static final @Px int ELEVATION = ViewUtil.dpToPx(4);
+public class ReviewBannerView extends LinearLayout {
 
   private ImageView       bannerIcon;
   private TextView        bannerMessage;
@@ -62,16 +61,6 @@ protected void onFinishInflate() {
     bottomRightAvatar.setFallbackPhotoProvider(provider);
 
     bannerClose.setOnClickListener(v -> setVisibility(GONE));
-
-    if (Build.VERSION.SDK_INT >= 21) {
-      setOutlineProvider(new ViewOutlineProvider() {
-        @Override
-        public void getOutline(View view, Outline outline) {
-          outline.setRect(-100, -100, view.getWidth() + 100, view.getHeight() + ELEVATION);
-        }
-      });
-      setElevation(ELEVATION);
-    }
   }
 
   public void setBannerMessage(@Nullable CharSequence charSequence) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
index 568cd8c06f7..08f4d889851 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java
@@ -112,6 +112,7 @@ private void postObligatoryForegroundNotification(@NonNull Entry active) {
                                                            .setContentTitle(active.title)
                                                            .setProgress(active.progressMax, active.progress, active.indeterminate)
                                                            .setContentIntent(PendingIntent.getActivity(this, 0, MainActivity.clearTop(this), 0))
+                                                           .setVibrate(new long[]{0})
                                                            .build());
   }
 
diff --git a/app/src/main/res/layout/conversation_activity.xml b/app/src/main/res/layout/conversation_activity.xml
index 93c042345cb..07512068cea 100644
--- a/app/src/main/res/layout/conversation_activity.xml
+++ b/app/src/main/res/layout/conversation_activity.xml
@@ -196,35 +196,38 @@
 
     </org.thoughtcrime.securesms.util.views.DarkOverflowToolbar>
 
-    <ViewStub
-        android:id="@+id/review_banner_stub"
+    <LinearLayout
+        android:id="@+id/conversation_banner_container"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:inflatedId="@+id/review_banner"
-        android:layout="@layout/review_banner_view"
+        android:orientation="vertical"
         app:layout_constraintTop_toBottomOf="@id/toolbar"
         app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline">
 
-    <ViewStub
-        android:id="@+id/unverified_banner_stub"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/unverified_banner"
-        android:layout="@layout/conversation_activity_unverified_banner_stub"
-        app:layout_constraintTop_toBottomOf="@id/review_banner_stub"
-        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        <ViewStub
+            android:id="@+id/unverified_banner_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/unverified_banner"
+            android:layout="@layout/conversation_activity_unverified_banner_stub" />
 
-    <ViewStub
-        android:id="@+id/reminder_stub"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:inflatedId="@+id/reminder"
-        android:layout="@layout/conversation_activity_reminderview_stub"
-        app:layout_constraintTop_toBottomOf="@id/unverified_banner_stub"
-        app:layout_constraintStart_toStartOf="@id/parent_start_guideline"
-        app:layout_constraintEnd_toEndOf="@id/parent_end_guideline"/>
+        <ViewStub
+            android:id="@+id/reminder_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/reminder"
+            android:layout="@layout/conversation_activity_reminderview_stub" />
+
+        <ViewStub
+            android:id="@+id/review_banner_stub"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inflatedId="@+id/review_banner"
+            android:layout="@layout/review_banner_view" />
+
+
+    </LinearLayout>
 
     <View
         android:id="@+id/conversation_toolbar_shadow"
diff --git a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
index 39fd4064fcd..13c9fb93839 100644
--- a/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
+++ b/app/src/main/res/layout/groupsv1_migration_bottom_sheet.xml
@@ -76,6 +76,13 @@
 
             </LinearLayout>
 
+            <ProgressBar
+                android:id="@+id/gv1_migrate_spinner"
+                android:layout_width="match_parent"
+                android:layout_height="75dp"
+                android:layout_marginTop="23dp"
+                android:indeterminate="true" />
+
             <LinearLayout
                 android:id="@+id/gv1_migrate_invite_container"
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/review_banner_view.xml b/app/src/main/res/layout/review_banner_view.xml
index 704f7933298..4eeb448432d 100644
--- a/app/src/main/res/layout/review_banner_view.xml
+++ b/app/src/main/res/layout/review_banner_view.xml
@@ -1,11 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView xmlns:android="http://schemas.android.com/apk/res/android"
+<org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/review_banner"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="108dp">
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="108dp"
+        android:background="@color/signal_background_primary">
 
     <FrameLayout
         android:id="@+id/banner_icon_frame"
@@ -92,4 +99,12 @@
         app:layout_constraintStart_toStartOf="@id/banner_message"
         app:layout_constraintTop_toBottomOf="@id/banner_message" />
 
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="5dp"
+        android:background="@drawable/toolbar_shadow"
+        app:layout_constraintBottom_toBottomOf="parent"/>
+
 </org.thoughtcrime.securesms.profiles.spoofing.ReviewBannerView>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index a8f4e215675..f261c1f15e2 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -26,10 +26,10 @@
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tap for at ændre din standard SMS applikation</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS deaktiveret</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Tap for at gøre Signal til din standard SMS app</string>
-  <string name="ApplicationPreferencesActivity_on">aktivér</string>
-  <string name="ApplicationPreferencesActivity_On">Aktivér</string>
-  <string name="ApplicationPreferencesActivity_off">déaktiver</string>
-  <string name="ApplicationPreferencesActivity_Off">Déaktiver</string>
+  <string name="ApplicationPreferencesActivity_on">aktiveret</string>
+  <string name="ApplicationPreferencesActivity_On">Aktiveret</string>
+  <string name="ApplicationPreferencesActivity_off">deaktiveret</string>
+  <string name="ApplicationPreferencesActivity_Off">Deaktiveret</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <string name="ApplicationPreferencesActivity_privacy_summary">Skærmlås %1$s, Registreringslås %2$s</string>
   <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Sprog %2$s</string>
@@ -344,7 +344,7 @@
   <string name="BackupsPreferenceFragment__verify_backup_passphrase">Verificer kodeord for backup</string>
   <string name="BackupsPreferenceFragment__test_your_backup_passphrase">Test dit kodeord for backup og verificer at det virker</string>
   <string name="BackupsPreferenceFragment__turn_on">Aktivér</string>
-  <string name="BackupsPreferenceFragment__turn_off">Déaktiver</string>
+  <string name="BackupsPreferenceFragment__turn_off">Deaktiver</string>
   <string name="BackupsPreferenceFragment__to_restore_a_backup">For at gendanne fra backup, skal du installere Signal igen. Åbn app\'en og tap \"Gendan backup\", vælg derefter en backup fil %1$s</string>
   <string name="BackupsPreferenceFragment__learn_more">Læs mere</string>
   <string name="BackupsPreferenceFragment__in_progress">I gang…</string>
@@ -657,8 +657,8 @@
   <string name="ManageRecipientActivity_mute_notifications">Udsæt notifikationer</string>
   <string name="ManageRecipientActivity_custom_notifications">Brugerdefinerede notifikationer</string>
   <string name="ManageRecipientActivity_until_s">Indtil %1$s</string>
-  <string name="ManageRecipientActivity_off">Déaktiver</string>
-  <string name="ManageRecipientActivity_on">Aktivér</string>
+  <string name="ManageRecipientActivity_off">Deaktiveret</string>
+  <string name="ManageRecipientActivity_on">Aktiveret</string>
   <string name="ManageRecipientActivity_add_to_a_group">Tilføj til en gruppe</string>
   <string name="ManageRecipientActivity_view_all_groups">Vis alle grupper</string>
   <string name="ManageRecipientActivity_see_all">Se alle</string>
@@ -1256,7 +1256,7 @@ nummer (%s) er ugyldigt</string>
   <string name="RegistrationLockV2Dialog_turn_off_registration_lock">Déaktiver registreringslås?</string>
   <string name="RegistrationLockV2Dialog_if_you_forget_your_signal_pin_when_registering_again">Hvis du glemmer din PIN-kode til Signal ved genregistrering af Signal, vil du blive låst ude af din konto i 7 dage</string>
   <string name="RegistrationLockV2Dialog_turn_on">Aktivér</string>
-  <string name="RegistrationLockV2Dialog_turn_off">Deaktivér</string>
+  <string name="RegistrationLockV2Dialog_turn_off">Deaktiver</string>
   <!--RevealableMessageView-->
   <string name="RevealableMessageView_view_photo">Vis billede</string>
   <string name="RevealableMessageView_view_video">Se video</string>
@@ -1442,7 +1442,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
   <string name="MessageNotifier_error_delivering_message">Fejl ved levering af besked</string>
   <string name="MessageNotifier_mark_all_as_read">Markér alle som læst</string>
   <string name="MessageNotifier_mark_read">Markér som læst</string>
-  <string name="MessageNotifier_turn_off_these_notifications">Déaktiver disse notifikationer</string>
+  <string name="MessageNotifier_turn_off_these_notifications">Deaktiver disse notifikationer</string>
   <string name="MessageNotifier_view_once_photo">Se billed én gang</string>
   <string name="MessageNotifier_view_once_video">Se video én gang</string>
   <string name="MessageNotifier_reply">Svar</string>
@@ -1982,7 +1982,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
   <string name="preferences_proxy">Proxy</string>
   <string name="preferences_use_proxy">Brug proxy</string>
   <string name="preferences_off">Deaktiveret</string>
-  <string name="preferences_on">Aktivér</string>
+  <string name="preferences_on">Aktiveret</string>
   <string name="preferences_proxy_address">Proxy-adresse</string>
   <string name="preferences_only_use_a_proxy_if">Brug kun en proxy, hvis du ikke er i stand til at oprette forbindelse til Signal på mobil eller Wi-Fi.</string>
   <string name="preferences_share">Del</string>
@@ -2290,7 +2290,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
   <string name="preferences_app_protection__pins_keep_information_stored_with_signal_encrypted">PIN-koder sikrer information lagret med Signal er krypteret, så kun du kan få adgang til den. Din profil, indstillinger og kontakter gendannes, når du installerer Signal igen.</string>
   <string name="preferences_app_protection__add_extra_security_by_requiring_your_signal_pin_to_register">Tilføj ekstra sikkerhed ved at kræve din Signal-pinkode til at registrere dit telefonnummer med Signal igen.</string>
   <string name="preferences_app_protection__reminders_help_you_remember_your_pin">Påmindelser hjælper dig med at huske din PIN, da den ikke kan gendannes. Over tid vil der gå længere tid imellem du bliver spurgt.</string>
-  <string name="preferences_app_protection__turn_off">Deaktivér</string>
+  <string name="preferences_app_protection__turn_off">Deaktiver</string>
   <string name="preferences_app_protection__confirm_pin">Bekræft PIN</string>
   <string name="preferences_app_protection__confirm_your_signal_pin">Bekræft din Signal PIN</string>
   <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">Vær sikker på at du husker eller sikkert gemmer din PIN, da den ikke kan gendannes. Hvis du glemmer din PIN, kan du miste data når du genregistrerer din Signal konto</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4c17001c9d0..870bd14293d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1094,7 +1094,7 @@
   <string name="ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen">In dieser Unterhaltung gesendete und empfangene Nachrichten werden %s nach dem Lesen verschwinden.</string>
   <!--OutdatedBuildReminder-->
   <string name="OutdatedBuildReminder_update_now">Jetzt aktualisieren</string>
-  <string name="OutdatedBuildReminder_your_version_of_signal_will_expire_today">Diese Signal-Version wird heute ablaufen. Aktualisiere zur neuesten Version.</string>
+  <string name="OutdatedBuildReminder_your_version_of_signal_will_expire_today">Diese Signal-Version wird heute ablaufen. Aktualisiere auf die neueste Version.</string>
   <plurals name="OutdatedBuildReminder_your_version_of_signal_will_expire_in_n_days">
     <item quantity="one">Diese Signal-Version wird morgen ablaufen. Aktualisiere auf die neueste Version.</item>
     <item quantity="other">Diese Signal-Version wird in %d Tagen ablaufen. Aktualisiere auf die neueste Version.</item>
@@ -1222,7 +1222,7 @@
   <string name="RegistrationActivity_this_device_is_missing_google_play_services">Auf diesem Gerät fehlen die Google-Play-Dienste. Signal kann immer noch verwendet werden, allerdings beeinträchtigt diese Konfiguration eventuell die Zuverlässigkeit oder die Leistung.\n\nFalls du kein erfahrener Nutzer bist, kein Custom-ROM verwendest oder glaubst, dass diese Meldung irrtümlich angezeigt wird, kontaktiere bitte support@signal.org für Hilfe bei der Problembehandlung.</string>
   <string name="RegistrationActivity_i_understand">Verstanden</string>
   <string name="RegistrationActivity_play_services_error">Fehler bei den Google-Play-Diensten</string>
-  <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google-Play-Dienste werden aktualisiert oder sind vorübergehend nicht verfügbar. Bitte erneut versuchen.</string>
+  <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google-Play-Dienste werden aktualisiert oder sind vorübergehend nicht verfügbar. Bitte versuche es erneut.</string>
   <string name="RegistrationActivity_terms_and_privacy">Nutzungsbedingungen und Datenschutzerklärung</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_and_media_in_order_to_connect_with_friends">Signal benötigt Zugriff auf deine Kontakte und Medien, damit du Nachrichten an Freunde senden und sichere Anrufe tätigen kannst.</string>
   <string name="RegistrationActivity_signal_needs_access_to_your_contacts_in_order_to_connect_with_friends">Signal benötigt Zugriff auf deine Kontakte, damit du Freunde kontaktieren und sichere Anrufe tätigen kannst.</string>
@@ -2127,7 +2127,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="CreateKbsPinFragment__pins_keep_information_stored_with_signal_encrypted">PINs halten bei Signal gespeicherte Informationen verschlüsselt, sodass nur du auf sie zugreifen kannst. Wenn du Signal erneut installierst, werden so dein Profil und deine Einstellungen und Kontakte wiederhergestellt. Für das Öffnen der App wirst du deine PIN nicht benötigen.</string>
   <string name="CreateKbsPinFragment__choose_a_stronger_pin">Wähle eine stärkere PIN</string>
   <!--ConfirmKbsPinFragment-->
-  <string name="ConfirmKbsPinFragment__pins_dont_match">PINs stimmen nicht überein. Bitte erneut versuchen.</string>
+  <string name="ConfirmKbsPinFragment__pins_dont_match">PINs stimmen nicht überein. Bitte versuche es erneut.</string>
   <string name="ConfirmKbsPinFragment__confirm_your_pin">Bestätige deine PIN.</string>
   <string name="ConfirmKbsPinFragment__pin_creation_failed">PIN konnte nicht erstellt werden</string>
   <string name="ConfirmKbsPinFragment__your_pin_was_not_saved">Deine PIN wurde nicht gespeichert. Wir werden dich später daran erinnern, eine PIN zu erstellen.</string>
@@ -2150,7 +2150,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="KbsReminderDialog__skip">Überspringen</string>
   <string name="KbsReminderDialog__submit">Übermitteln</string>
   <string name="KbsReminderDialog__forgot_pin">PIN vergessen?</string>
-  <string name="KbsReminderDialog__incorrect_pin_try_again">Falsche PIN. Bitte erneut versuchen.</string>
+  <string name="KbsReminderDialog__incorrect_pin_try_again">Falsche PIN. Bitte versuche es erneut.</string>
   <!--AccountLockedFragment-->
   <string name="AccountLockedFragment__account_locked">Konto gesperrt</string>
   <string name="AccountLockedFragment__your_account_has_been_locked_to_protect_your_privacy">Dein Konto wurde gesperrt, um deine Privatsphäre und Sicherheit zu schützen. Nach Ablauf von %1$d Tagen ohne Kontoaktivität kannst du diese Rufnummer ohne PIN erneut registrieren. Alle Inhalte werden dabei gelöscht.</string>
@@ -2161,7 +2161,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="RegistrationLockFragment__enter_the_pin_you_created">Gib die PIN ein, die du für dein Konto erstellt hast. Sie unterscheidet sich von deinem SMS-Verifikationscode.</string>
   <string name="RegistrationLockFragment__enter_alphanumeric_pin">Alphanumerische PIN eingeben</string>
   <string name="RegistrationLockFragment__enter_numeric_pin">Numerische PIN eingeben</string>
-  <string name="RegistrationLockFragment__incorrect_pin_try_again">Falsche PIN. Bitte erneut versuchen.</string>
+  <string name="RegistrationLockFragment__incorrect_pin_try_again">Falsche PIN. Bitte versuche es erneut.</string>
   <string name="RegistrationLockFragment__forgot_pin">PIN vergessen?</string>
   <string name="RegistrationLockFragment__incorrect_pin">Falsche PIN</string>
   <string name="RegistrationLockFragment__forgot_your_pin">PIN vergessen?</string>
@@ -2283,7 +2283,7 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <string name="preferences_app_protection__confirm_pin">PIN bestätigen</string>
   <string name="preferences_app_protection__confirm_your_signal_pin">Bestätige deine Signal-PIN</string>
   <string name="preferences_app_protection__make_sure_you_memorize_or_securely_store_your_pin">Sorge dafür, dass du dir deine PIN einprägst oder sicher verwahrst, da sie nicht wiederhergestellt werden kann. Falls du deine PIN vergisst, könntest du bei erneutem Registrieren deines Signal-Kontos deine Daten verlieren.</string>
-  <string name="preferences_app_protection__incorrect_pin_try_again">Falsche PIN. Bitte erneut versuchen.</string>
+  <string name="preferences_app_protection__incorrect_pin_try_again">Falsche PIN. Bitte versuche es erneut.</string>
   <string name="preferences_app_protection__failed_to_enable_registration_lock">Registrierungssperre konnte nicht aktiviert werden.</string>
   <string name="preferences_app_protection__failed_to_disable_registration_lock">Registrierungssperre konnte nicht deaktiviert werden.</string>
   <string name="AppProtectionPreferenceFragment_none">Keine</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 27ac1b2aa10..27ccd4bc620 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -66,6 +66,7 @@
   <string name="AttachmentUploadJob_uploading_media">Multimedia igotzen…</string>
   <string name="AttachmentUploadJob_compressing_video_start">Bideoa konprimatzen…</string>
   <!--BackgroundMessageRetriever-->
+  <string name="BackgroundMessageRetriever_checking_for_messages">Mezuak dauden bilatzen…</string>
   <!--BlockedUsersActivity-->
   <string name="BlockedUsersActivity__blocked_users">Blokeatutako erabiltzaileak</string>
   <string name="BlockedUsersActivity__add_blocked_user">Gehitu blokeatutako erabiltzailea</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 481150d69d7..68502aa9ed3 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -65,6 +65,7 @@
   <string name="AttachmentUploadJob_uploading_media">Mengunggah media…</string>
   <string name="AttachmentUploadJob_compressing_video_start">Mengompresi video…</string>
   <!--BackgroundMessageRetriever-->
+  <string name="BackgroundMessageRetriever_checking_for_messages">Memeriksa pesan baru…</string>
   <!--BlockedUsersActivity-->
   <string name="BlockedUsersActivity__blocked_users">Pengguna diblokir</string>
   <string name="BlockedUsersActivity__add_blocked_user">Tambah pengguna diblokir</string>
@@ -279,6 +280,7 @@
   <string name="ConversationFragment_verify">Memeriksa</string>
   <string name="ConversationFragment_not_now">Nanti saja</string>
   <string name="ConversationFragment_your_safety_number_with_s_changed">Angka keamanan Anda dengan %s berubah</string>
+  <string name="ConversationFragment_your_safety_number_with_s_changed_likey_because_they_reinstalled_signal">Nomor keamanan Anda dengan %s berubah, mungkin karena mereka memasang ulang Signal atau mengganti perangkat. Ketuk Verifikasi untuk mengonfirmasi nomor keamanan barunya. Ini bersifat opsional.</string>
   <plurals name="ConversationListFragment_delete_selected_conversations">
     <item quantity="other">Hapus percakapan terpilih?</item>
   </plurals>
@@ -452,6 +454,7 @@
   <!--GroupsV1MigrationInitiationReminder-->
   <string name="GroupsV1MigrationInitiationReminder_to_access_new_features_like_mentions">Untuk mengakses fitur-fitur baru seperti @mention dan admin, perbarui grup ini.</string>
   <string name="GroupsV1MigrationInitiationReminder_not_now">Nanti saja</string>
+  <string name="GroupsV1MigrationInitiationReminder_upgrade_group">Perbarui grup</string>
   <!--GroupsV1MigrationSuggestionsReminder-->
   <plurals name="GroupsV1MigrationSuggestionsReminder_members_couldnt_be_added_to_the_new_group">
     <item quantity="other">%1$d anggota tidak dapat ditambahkan ulang ke dalam Grup Baru. Apa Anda ingin menambahkan mereka sekarang?</item>
@@ -590,6 +593,7 @@
   <string name="ManageGroupActivity_edit_name_and_picture">Sunting nama dan gambar</string>
   <string name="ManageGroupActivity_legacy_group">Grup Warisan</string>
   <string name="ManageGroupActivity_legacy_group_learn_more">Ini adalah Grup Warisan. Fitur-fitur seperti admin grup hana tersedia untuk Grup Baru.</string>
+  <string name="ManageGroupActivity_legacy_group_upgrade">Ini Grup Warisan. Untuk mengakses fitur-firue baru seperti @mention dan admin,</string>
   <string name="ManageGroupActivity_legacy_group_too_large">Grup lama ini tidak bisa ditingkatkan menjadi grup yang baru karena terlalu besar. Ukuran maksimum grup adalah %1$d.</string>
   <string name="ManageGroupActivity_upgrade_this_group">perbarui grup ini.</string>
   <string name="ManageGroupActivity_this_is_an_insecure_mms_group">Ini adalah Grup MMS yang tidak aman. Untuk mengobrol secara privat, undang kontak Anda ke Signal.</string>
@@ -603,6 +607,7 @@
   <string name="ManageProfileFragment_profile_name">Nama profil</string>
   <string name="ManageProfileFragment_username">Nama Pengguna</string>
   <string name="ManageProfileFragment_about">Tentang</string>
+  <string name="ManageProfileFragment_write_a_few_words_about_yourself">Tulis beberapa kata tentang Anda</string>
   <string name="ManageProfileFragment_your_name">Nama anda</string>
   <!--ManageRecipientActivity-->
   <string name="ManageRecipientActivity_add_to_system_contacts">Tambahkan ke kontak</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 0cc638025f3..143f3159b83 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -66,6 +66,7 @@
   <string name="AttachmentUploadJob_uploading_media">Laster opp media…</string>
   <string name="AttachmentUploadJob_compressing_video_start">Komprimerer video…</string>
   <!--BackgroundMessageRetriever-->
+  <string name="BackgroundMessageRetriever_checking_for_messages">Ser etter meldinger…</string>
   <!--BlockedUsersActivity-->
   <string name="BlockedUsersActivity__blocked_users">Blokkerte brukere</string>
   <string name="BlockedUsersActivity__add_blocked_user">Legg til blokkert bruker</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 27dc0501aab..c6d34d7e5bd 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -21,7 +21,7 @@
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Je telefoonnummer wordt afgemeld voor Signal-berichten en -oproepen …</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal-berichten en -oproepen uitschakelen?</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Dit zal je telefoonnummer uitschrijven bij de servers, je kunt dan niet langer Signal-berichten en -oproepen ontvangen of verzenden. Je zult je telefoonnummer opnieuw moeten registreren als je die functies weer wilt gebruiken.</string>
-  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server!</string>
+  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fout bij verbinden met de server.</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Sms is ingeschakeld</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tik hier als je je standaard-sms-applicatie wilt wijzigen</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Sms is uitgeschakeld</string>
@@ -58,7 +58,7 @@
   <string name="AttachmentKeyboard_Signal_needs_permission_to_show_your_photos_and_videos">Signal heeft toegang nodig tot de externe opslagruimte om afbeeldingen en video\'s weer te kunnen geven.</string>
   <string name="AttachmentKeyboard_give_access">Toestemming geven</string>
   <!--AttachmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Geen app gevonden om media te selecteren.</string>
+  <string name="AttachmentManager_cant_open_media_selection">Er is geen app gevonden waarmee je media zou kunnen selecteren.</string>
   <string name="AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio">Signal heeft toegang nodig tot de externe opslagruimte om afbeeldingen, video\'s of audio te kunnen verzenden, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, selecteer  ‘Machtigingen’ en schakel ‘Opslagruimte’ in.</string>
   <string name="AttachmentManager_signal_requires_contacts_permission_in_order_to_attach_contact_information">Signal heeft toegang nodig tot de contacten om contactinformatie in Signal weer te geven, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, selecteer ‘Toestemmingen’ en schakel ‘Contacten’ in.</string>
   <string name="AttachmentManager_signal_requires_location_information_in_order_to_attach_a_location">Signal heeft toegang nodig tot de locatie om locaties te kunnen verzenden aan je gesprekspartners, maar deze toestemming is pertinent geweigerd. Ga naar de instellingen, selecteer ‘Toestemmingen’ en schakel ‘Locatie’ in.</string>
@@ -159,7 +159,7 @@
   <string name="ContactShareEditActivity_type_mobile">Mobiel</string>
   <string name="ContactShareEditActivity_type_work">Werk</string>
   <string name="ContactShareEditActivity_type_missing">Anders</string>
-  <string name="ContactShareEditActivity_invalid_contact">Het geselecteerde contact was ongeldig</string>
+  <string name="ContactShareEditActivity_invalid_contact">De geselecteerde contactpersoon was ongeldig</string>
   <!--ConversationItem-->
   <string name="ConversationItem_error_not_sent_tap_for_details">Niet verzonden, tik hier voor details</string>
   <string name="ConversationItem_error_partially_not_delivered">Gedeeltelijk verzonden, tik hier voor details</string>
@@ -1364,7 +1364,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
   <string name="ThreadRecord_you_marked_verified">Door jou als geverifieerd gemarkeerd</string>
   <string name="ThreadRecord_you_marked_unverified">Door jou als niet geverifieerd gemarkeerd</string>
   <string name="ThreadRecord_message_could_not_be_processed">Bericht kon niet worden verwerkt</string>
-  <string name="ThreadRecord_message_request">Gespreksverzoeken</string>
+  <string name="ThreadRecord_message_request">Gespreksverzoek</string>
   <string name="ThreadRecord_photo">Afbeelding</string>
   <string name="ThreadRecord_gif">GIF</string>
   <string name="ThreadRecord_voice_message">Audiobericht</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 6ed1d8c1405..d1f27272d7c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -66,6 +66,7 @@
   <string name="AttachmentUploadJob_uploading_media">Enviando mídia…</string>
   <string name="AttachmentUploadJob_compressing_video_start">Comprimindo vídeo…</string>
   <!--BackgroundMessageRetriever-->
+  <string name="BackgroundMessageRetriever_checking_for_messages">Procurando mensagens…</string>
   <!--BlockedUsersActivity-->
   <string name="BlockedUsersActivity__blocked_users">Pessoas bloqueadas</string>
   <string name="BlockedUsersActivity__add_blocked_user">Adicionar uma pessoa bloqueada</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 2c2901732e1..975bf8537ad 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -66,6 +66,7 @@
   <string name="AttachmentUploadJob_uploading_media">میڈیا اپ لوڈ ہو رہا ہے۔</string>
   <string name="AttachmentUploadJob_compressing_video_start">ویڈیو مختصر ہو رہی ہے۔۔۔</string>
   <!--BackgroundMessageRetriever-->
+  <string name="BackgroundMessageRetriever_checking_for_messages">پیغامات کی جانچ ہو رہی ہے…</string>
   <!--BlockedUsersActivity-->
   <string name="BlockedUsersActivity__blocked_users">مسدود صارفین</string>
   <string name="BlockedUsersActivity__add_blocked_user">مسدود صارف کو شامل کریں</string>
@@ -471,6 +472,7 @@
   <!--GroupsV1MigrationInitiationReminder-->
   <string name="GroupsV1MigrationInitiationReminder_to_access_new_features_like_mentions">@ذکر, خصوصیات اور منتظمین جیسی نئی خصوصیات تک رسائی حاصل کرنے کے لیئے اس گروپ کو اپ گریڈ کریں۔</string>
   <string name="GroupsV1MigrationInitiationReminder_not_now">ابھی نہیں</string>
+  <string name="GroupsV1MigrationInitiationReminder_upgrade_group">گروپ کو اپ گریڈ کریں</string>
   <!--GroupsV1MigrationSuggestionsReminder-->
   <plurals name="GroupsV1MigrationSuggestionsReminder_members_couldnt_be_added_to_the_new_group">
     <item quantity="one">نئے گروپ میں %1$d ممبر کو دوبارہ شامل نہیں کیا جاسکا۔ کیا آپ انہیں ابھی شامل کرنا چاہتے ہیں؟</item>
@@ -603,6 +605,7 @@
   <string name="ManageGroupActivity_mute_notifications">خاموش اطلاعات</string>
   <string name="ManageGroupActivity_custom_notifications">اپنی مرضی کے مطابق اطلاعات</string>
   <string name="ManageGroupActivity_mentions">ذکر</string>
+  <string name="ManageGroupActivity_chat_wallpaper">چیٹ وال پیپر</string>
   <string name="ManageGroupActivity_until_s">جب تک %1$s</string>
   <string name="ManageGroupActivity_off">بند کریں</string>
   <string name="ManageGroupActivity_on">چلائیں</string>
@@ -638,12 +641,16 @@
   <string name="ManageProfileFragment_profile_name">پروفائل کا نام</string>
   <string name="ManageProfileFragment_username">صارف کا نام</string>
   <string name="ManageProfileFragment_about">متعلق</string>
+  <string name="ManageProfileFragment_write_a_few_words_about_yourself">اپنے بارے میں کچھ الفاظ لکھیں</string>
   <string name="ManageProfileFragment_your_name">آپ کا نام</string>
+  <string name="ManageProfileFragment_your_username">اپکا اسم رکنیت</string>
+  <string name="ManageProfileFragment_failed_to_set_avatar">اوتار سیٹ کرنے میں ناکام</string>
   <!--ManageRecipientActivity-->
   <string name="ManageRecipientActivity_add_to_system_contacts">سسٹم رابطوں میں شامل کریں</string>
   <string name="ManageRecipientActivity_this_person_is_in_your_contacts">یہ شخص آپ کے رابطوں میں ہے</string>
   <string name="ManageRecipientActivity_disappearing_messages">پیغامات غائب ہو رہے ہیں</string>
   <string name="ManageRecipientActivity_chat_color">چیٹ کا رنگ</string>
+  <string name="ManageRecipientActivity_chat_wallpaper">چیٹ وال پیپر</string>
   <string name="ManageRecipientActivity_block">بلاک</string>
   <string name="ManageRecipientActivity_unblock">ان بلاک</string>
   <string name="ManageRecipientActivity_view_safety_number">حفاظتی نمبر دیکھیں</string>
@@ -1100,6 +1107,7 @@
   <string name="PassphrasePromptActivity_ok_button_content_description">پاسفریز جمع کریں</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">غلط پاسفریز!</string>
   <string name="PassphrasePromptActivity_unlock_signal">Signal ان لاک کریں</string>
+  <string name="PassphrasePromptActivity_signal_android_lock_screen">Signal Android - لاک اسکرین</string>
   <!--PlacePickerActivity-->
   <string name="PlacePickerActivity_title">نقشہ</string>
   <string name="PlacePickerActivity_drop_pin">ڈراپ پن</string>
@@ -1197,6 +1205,11 @@
   <string name="CallParticipantView__cant_receive_audio_and_video_from_s">%1$s سے آڈیو اور ویڈیو موصول نہیں ہوسکتی ہے</string>
   <string name="CallParticipantView__this_may_be_Because_they_have_not_verified_your_safety_number_change">اس کی وجہ یہ ہوسکتی ہے کہ انہوں نے آپ کے حفاظتی نمبر میں تبدیلی کی توثیق نہیں کی ہے ، ان کے آلے میں کوئی مسئلہ ہے یا انہوں نے آپ کو مسدود کردیا ہے۔</string>
   <!--ProxyBottomSheetFragment-->
+  <string name="ProxyBottomSheetFragment_proxy_server">پراکسی سرور</string>
+  <string name="ProxyBottomSheetFragment_proxy_address">پراکسی ایڈریس</string>
+  <string name="ProxyBottomSheetFragment_do_you_want_to_use_this_proxy_address">کیا آپ یہ پراکسی ایڈریس استعمال کرنا چاہتے ہیں؟</string>
+  <string name="ProxyBottomSheetFragment_use_proxy">پروکسی استعمال کرو</string>
+  <string name="ProxyBottomSheetFragment_successfully_connected_to_proxy">پراکسی سے کامیابی کے ساتھ منسلک ہوا۔</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_select_your_country">اپنے ملک کا انتخاب کریں</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">آپ لازمی ملک کا کوڈ واضع کریں</string>
@@ -1307,6 +1320,7 @@
   <string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">اس یو آر ایل کو کاپی کریں اور اسے اپنی ایشو رپورٹ یا سپورٹ ای میل میں شامل کریں:. n \ n<b>%1$s</b></string>
   <string name="SubmitDebugLogActivity_share">اشتراک کریں</string>
   <!--SupportEmailUtil-->
+  <string name="SupportEmailUtil_filter">فلٹر:</string>
   <string name="SupportEmailUtil_device_info">Device کی معلومات:</string>
   <string name="SupportEmailUtil_android_version">Android ورژن:</string>
   <string name="SupportEmailUtil_signal_version">Signal ورژن:</string>
@@ -1686,13 +1700,24 @@
   <string name="CreateProfileActivity_custom_mms_group_names_and_photos_will_only_be_visible_to_you">کسٹم MMS گروپ کے نام اور تصاویر صرف آپ کو نظر آئیں گی۔</string>
   <!--EditAboutFragment-->
   <string name="EditAboutFragment_about">متعلق</string>
+  <string name="EditAboutFragment_write_a_few_words_about_yourself">اپنے بارے میں کچھ الفاظ لکھیں…</string>
+  <string name="EditAboutFragment_count">%1$d/%2$d</string>
+  <string name="EditAboutFragment_speak_freely">آزادانہ طور پر بولیں</string>
+  <string name="EditAboutFragment_encrypted">خفیہ کردہ</string>
+  <string name="EditAboutFragment_be_kind">مہربانی سے پیش آؤ</string>
+  <string name="EditAboutFragment_coffee_lover">کافی کا دیوانہ</string>
+  <string name="EditAboutFragment_free_to_chat">چیٹ کرنے کے لئے دستیاب</string>
+  <string name="EditAboutFragment_taking_a_break">ایک وقفے پر</string>
+  <string name="EditAboutFragment_working_on_something_new">کسی نئی چیز پر کام کرنا</string>
   <!--EditProfileFragment-->
   <string name="EditProfileFragment__edit_group_name_and_photo">گروپ کے نام اور تصویر میں ترمیم کریں</string>
   <string name="EditProfileFragment__group_name">گروپ کا نام</string>
   <!--EditProfileNameFragment-->
   <string name="EditProfileNameFragment_your_name">آپ کا نام</string>
+  <string name="EditProfileNameFragment_first_name">پہلا نام</string>
   <string name="EditProfileNameFragment_last_name_optional">آخری نام (اختیاری)</string>
   <string name="EditProfileNameFragment_save">محفوظ کریں</string>
+  <string name="EditProfileNameFragment_failed_to_save_due_to_network_issues_try_again_later">نیٹ ورک کے مسائل کی وجہ سے بچانے میں ناکام۔ بعد میں دوبارہ کوشش کریں۔</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__shared_media">میڈیا اشتراک کریں</string>
   <!--recipients_panel-->
@@ -1865,6 +1890,7 @@
   <string name="preferences__dark_theme">اندھیرا</string>
   <string name="preferences__appearance">ظہور ہونا</string>
   <string name="preferences__theme">موضوع</string>
+  <string name="preferences__chat_wallpaper">چیٹ وال پیپر</string>
   <string name="preferences__disable_pin">PIN کو غیر فعال کریں</string>
   <string name="preferences__enable_pin">PIN کو فعال کریں</string>
   <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">اگر آپ PIN کو غیر فعال کردیتے ہیں تو ، آپ جب تک دستی طور پر بیک اپ اور بحالی نہیں کرتے ہیں تب تک آپ تمام اعداد و شمار کو کھو دیں گے۔ جب PIN غیر فعال ہو تو آپ رجسٹریشن لاک آن نہیں کرسکتے ہیں۔</string>
@@ -1883,6 +1909,7 @@
   <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">اگر پڑھنے کی رسیدیں غیر فعال کردی گئی ہیں تو ، آپ دوسروں کی پڑھی ہوئی رسیدیں نہیں دیکھ پائیں گے۔</string>
   <string name="preferences__typing_indicators">ٹائپنگ انڈیکیٹرز</string>
   <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">اگر ٹائپنگ اندیکیٹرز غیر فعال ہیں، آپ دوسروں سے ٹائپنگ انڈیکیٹرز دیکھنے کے قابل نہیں ہیں۔</string>
+  <string name="preferences__request_keyboard_to_disable_personalized_learning">ذاتی سیکھنے کو غیر فعال کرنے کے لئے کی بورڈ سے درخواست کریں۔ یہ ترتیب ضمانت نہیں ہے ، اور آپ کا کی بورڈ اسے نظرانداز کرسکتا ہے۔</string>
   <string name="preferences_app_protection__blocked_users">مسدود صارفین</string>
   <string name="preferences_chats__when_using_mobile_data">جب موبائل ڈیٹا استعمال کریں</string>
   <string name="preferences_chats__when_using_wifi">جب وائی فائی استعمال کریں</string>
@@ -1943,10 +1970,22 @@
   <string name="preferences_communication__sealed_sender_allow_from_anyone_description">غیر رابطوں اور ان لوگوں کی طرف سے آنے والے پیغامات کے لئے مہر بند مرسل کو اہل بنائیں جن کے ساتھ آپ نے اپنا پروفائل اشتراک نہیں کیا ہے۔</string>
   <string name="preferences_communication__sealed_sender_learn_more">مزید پڑھیں</string>
   <string name="preferences_setup_a_username">ایک صارف کا نام مرتب کریں</string>
+  <string name="preferences_proxy">پراکسی</string>
+  <string name="preferences_use_proxy">پروکسی استعمال کرو</string>
   <string name="preferences_off">بند کریں</string>
   <string name="preferences_on">چلائیں</string>
+  <string name="preferences_proxy_address">پراکسی ایڈریس</string>
+  <string name="preferences_only_use_a_proxy_if">صرف ایک پراکسی استعمال کریں اگر آپ سیلولر یا Wi-Fi پر Signal سے رابطہ قائم کرنے کے قابل نہیں ہیں۔</string>
   <string name="preferences_share">اشتراک کریں</string>
   <string name="preferences_save">محفوظ کریں</string>
+  <string name="preferences_connecting_to_proxy">پراکسی سے منسلک ہو رہا ہے…</string>
+  <string name="preferences_connected_to_proxy">پراکسی سے منسلک</string>
+  <string name="preferences_connection_failed">رابطہ ناکام</string>
+  <string name="preferences_couldnt_connect_to_the_proxy">پراکسی سے رابطہ قائم نہیں ہوسکا۔ پراکسی ایڈریس چیک کریں اور دوبارہ کوشش کریں۔</string>
+  <string name="preferences_you_are_connected_to_the_proxy">آپ پراکسی سے جڑے ہوئے ہیں۔ آپ کسی بھی وقت ترتیبات سے پراکسی بند کرسکتے ہیں۔</string>
+  <string name="preferences_success">کامیابی</string>
+  <string name="preferences_failed_to_connect">رابطہ ناکام ہوگیا</string>
+  <string name="preferences_enter_proxy_address">پراکسی ایڈریس درج کریں</string>
   <string name="configurable_single_select__customize_option">آپشن کو کسٹمائز کریں</string>
   <!--Internal only preferences-->
   <!--****************************************-->
@@ -2129,6 +2168,8 @@
   <string name="RegistrationLockFragment__incorrect_pin">غلط پن</string>
   <string name="RegistrationLockFragment__forgot_your_pin">آپ کا پن بھول گیا؟</string>
   <string name="RegistrationLockFragment__not_many_tries_left">بہت ساری کوششیں باقی نہیں ہیں!</string>
+  <string name="RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v1_pin">Signal اندراج - Android کے لئے پن کے ساتھ مدد کی ضرورت ہے (v1 PIN)</string>
+  <string name="RegistrationLockFragment__signal_registration_need_help_with_pin_for_android_v2_pin">Signal اندراج - Android کے لئے پن کے ساتھ مدد کی ضرورت ہے (v2 PIN)</string>
   <plurals name="RegistrationLockFragment__for_your_privacy_and_security_there_is_no_way_to_recover">
     <item quantity="one">آپ کی رازداری اور سیکیورٹی کے لیئے آپ کے PIN کی بازیافت کا کوئی راستہ نہیں ہے۔ اگر آپ اپنا PIN یاد نہیں کرسکتے ہیں تو ، غیر فعال ہونے کے%1$d دن کے بعد آپ SMS کے ذریعے دوبارہ تصدیق کر سکتے ہیں۔ اس معاملے میں ، آپ کا اکاؤنٹ صاف ہوجائے گا اور تمام مواد حذف ہوجائے گا۔</item>
     <item quantity="other">آپ کی رازداری اور سیکیورٹی کے لیئے ، آپ کے PIN کی بازیافت کا کوئی راستہ نہیں ہے۔ اگر آپ اپنا PIN یاد نہیں کرسکتے ہیں تو ، آپ غیر فعال%1$d دنوں کے بعد ایس ایم ایس کے ذریعے دوبارہ تصدیق کر سکتے ہیں۔ اس معاملے میں ، آپ کا اکاؤنٹ صاف ہوجائے گا اور تمام مواد حذف ہوجائے گا۔</item>
@@ -2364,16 +2405,44 @@
   <!--ShareActivity-->
   <string name="ShareActivity__share">اشتراک کریں</string>
   <string name="ShareActivity__send">بھیجیں</string>
+  <string name="ShareActivity__s_comma">%1$s,</string>
+  <string name="ShareActivity__sharing_to_multiple_chats_is">متعدد چیٹس پر اشتراک صرف Signal پیغامات کیلئے معاون ہے</string>
   <!--MultiShareDialogs-->
+  <string name="MultiShareDialogs__failed_to_send_to_some_users">کچھ صارفین کو بھیجنے میں ناکام</string>
+  <string name="MultiShareDialogs__you_can_only_share_with_up_to">آپ صرف %1$d چیٹس تک اشتراک کرسکتے ہیں</string>
   <!--ShareInterstitialActivity-->
   <string name="ShareInterstitialActivity__forward_message">پیغام آگے بھیجیں</string>
   <!--ChatWallpaperActivity-->
+  <string name="ChatWallpaperActivity__chat_wallpaper">چیٹ وال پیپر</string>
   <!--ChatWallpaperFragment-->
+  <string name="ChatWallpaperFragment__set_wallpaper">وال پیپر سیٹ کریں</string>
+  <string name="ChatWallpaperFragment__dark_theme_dims_wallpaper">سیاہ تھیم وال پیپر کو مدھم کرتا ہے</string>
+  <string name="ChatWallpaperFragment__clear_wallpaper">وال پیپر صاف کریں</string>
+  <string name="ChatWallpaperFragment__clear_wallpaper_for_this_chat">اس چیٹ کے لئے وال پیپر صاف کریں؟</string>
+  <string name="ChatWallpaperFragment__clear_wallpaper_this_will_not">وال پیپر صاف کریں؟ اس سے وہ کسٹم وال پیپر صاف نہیں ہوں گے جو آپ نے اپنی چیٹس کے لیئے رکھے ہیں۔</string>
+  <string name="ChatWallpaperFragment__reset_all_wallpapers">تمام وال پیپر کو دوبارہ ترتیب دیں</string>
+  <string name="ChatWallpaperFragment__reset_all_wallpapers_including_custom">آپ نے اپنی چیٹس کیلئے مرتب کردہ کسٹم وال پیپرز سمیت تمام وال پیپرز کو دوبارہ ترتیب دیں۔</string>
+  <string name="ChatWallpaperFragment__contact_name">رابطے کا نام</string>
   <string name="ChatWallpaperFragment__reset">دوبارہ بحال کریں</string>
+  <string name="ChatWallpaperFragment__clear">صاف</string>
+  <string name="ChatWallpaperFragment__wallpaper_preview_description">وال پیپر پیش نظارہ</string>
   <!--ChatWallpaperSelectionFragment-->
+  <string name="ChatWallpaperSelectionFragment__choose_from_photos">فوٹو میں سے انتخاب کریں</string>
+  <string name="ChatWallpaperSelectionFragment__presets">پریسیٹس</string>
   <!--ChatWallpaperPreviewActivity-->
+  <string name="ChatWallpaperPreviewActivity__preview">پیش نظارہ</string>
+  <string name="ChatWallpaperPreviewActivity__set_wallpaper">وال پیپر سیٹ کریں</string>
+  <string name="ChatWallpaperPreviewActivity__swipe_to_preview_more_wallpapers">مزید وال پیپرز کا پیش نظارہ کرنے کے لئے سوائپ کریں</string>
+  <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_all_chats">تمام چیٹس کیلئے وال پیپر مرتب کریں</string>
+  <string name="ChatWallpaperPreviewActivity__set_wallpaper_for_s">%1$s کے لئے وال پیپر سیٹ کریں</string>
   <string name="ChatWallpaperPreviewActivity__viewing_your_gallery_requires_the_storage_permission">اپنے گیلری کو دیکھنے کیلئے اسٹوریج کی اجازت درکار ہے۔</string>
   <!--WallpaperImageSelectionActivity-->
+  <string name="WallpaperImageSelectionActivity__choose_wallpaper_image">وال پیپر کی تصویر منتخب کریں</string>
   <!--WallpaperCropActivity-->
+  <string name="WallpaperCropActivity__pinch_to_zoom_drag_to_adjust">زوم کرنے کے لئے pinch ، ایڈجسٹ کرنے کے لئے گھسیٹیں۔</string>
+  <string name="WallpaperCropActivity__set_wallpaper_for_all_chats">تمام چیٹس کیلئے وال پیپر مرتب کریں۔</string>
+  <string name="WallpaperCropActivity__set_wallpaper_for_s">%s کے لئے وال پیپر سیٹ کریں۔</string>
+  <string name="WallpaperCropActivity__error_setting_wallpaper">وال پیپر کی ترتیب میں خامی۔</string>
+  <string name="WallpaperCropActivity__blur_photo">تصویر کو دھندلا کرو</string>
   <!--EOF-->
 </resources>
diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index 053e90bd55b..6544d83e2d1 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -426,11 +426,11 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-android:0.2.3',
-         '21e7bd8cc80559ee064e2acf7b9d091155c6b511e8b186fa1310267a5ab50e5c'],
+        ['org.whispersystems:signal-client-android:0.1.5',
+         'a95f4d8125a22552da99b5db15589454789eee322e84d9ba613c258150366a64'],
 
-        ['org.whispersystems:signal-client-java:0.2.3',
-         '6d3648e0cb9e22a921198f853a4886bdbaed26a4c52accf559618d75c2189b89'],
+        ['org.whispersystems:signal-client-java:0.1.5',
+         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
 
         ['pl.tajchert:waitingdots:0.1.0',
          '2835d49e0787dbcb606c5a60021ced66578503b1e9fddcd7a5ef0cd5f095ba2c'],
diff --git a/libsignal/service/build.gradle b/libsignal/service/build.gradle
index a9ede8d1c54..5a4d9afbf02 100644
--- a/libsignal/service/build.gradle
+++ b/libsignal/service/build.gradle
@@ -21,7 +21,7 @@ dependencies {
     api 'com.googlecode.libphonenumber:libphonenumber:8.12.17'
     api 'com.fasterxml.jackson.core:jackson-databind:2.9.9.2'
 
-    api 'org.whispersystems:signal-client-java:0.2.3'
+    api 'org.whispersystems:signal-client-java:0.1.5'
     api 'com.squareup.okhttp3:okhttp:3.12.10'
     implementation 'org.threeten:threetenbp:1.3.6'
 
diff --git a/libsignal/service/witness-verifications.gradle b/libsignal/service/witness-verifications.gradle
index 3a486939ca4..dde8f02b941 100644
--- a/libsignal/service/witness-verifications.gradle
+++ b/libsignal/service/witness-verifications.gradle
@@ -30,7 +30,7 @@ dependencyVerification {
         ['org.threeten:threetenbp:1.3.6',
          'f4c23ffaaed717c3b99c003e0ee02d6d66377fd47d866fec7d971bd8644fc1a7'],
 
-        ['org.whispersystems:signal-client-java:0.2.3',
-         '6d3648e0cb9e22a921198f853a4886bdbaed26a4c52accf559618d75c2189b89'],
+        ['org.whispersystems:signal-client-java:0.1.5',
+         'f5beec3fe3ef75346c2cd103278c7b0c0e117f8a97405bf9edd3bf3ff1881b70'],
     ]
 }