diff --git a/res/values/strings.xml b/res/values/strings.xml
index da2f419b43..a1a3dd9b3b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -737,7 +737,6 @@
Bad encrypted message
Message encrypted for non-existing session
You have sent a session restoration request to %s
- Secure session reset done
Bad encrypted MMS message
@@ -1854,4 +1853,6 @@
*Please note that it is not possible to use the same Session ID on multiple devices simultaneously
+ Secure session reset done
+
diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
index 273bbd6c89..127375cdc7 100644
--- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
@@ -18,9 +18,10 @@
package org.thoughtcrime.securesms.database.model;
import android.content.Context;
-import androidx.annotation.NonNull;
import android.text.SpannableString;
+import androidx.annotation.NonNull;
+
import org.thoughtcrime.securesms.database.MmsSmsColumns;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
@@ -84,7 +85,7 @@ public class SmsMessageRecord extends MessageRecord {
} else if (isLokiSessionRestoreSent()) {
return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
} else if (isLokiSessionRestoreDone()) {
- return emphasisAdded(context.getString(R.string.MessageRecord_session_restore_done));
+ return emphasisAdded(context.getString(R.string.view_reset_secure_session_done_message));
} else if (isEndSession() && isOutgoing()) {
return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
} else if (isEndSession()) {
diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index 081340fcd5..edac627a05 100644
--- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -19,13 +19,14 @@ package org.thoughtcrime.securesms.database.model;
import android.content.Context;
import android.net.Uri;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.TextUtils;
import android.text.style.StyleSpan;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
import org.thoughtcrime.securesms.database.MmsSmsColumns;
import org.thoughtcrime.securesms.database.SmsDatabase;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -85,7 +86,7 @@ public class ThreadRecord extends DisplayRecord {
} else if (isLokiSessionRestoreSent()) {
return emphasisAdded(context.getString(R.string.SmsMessageRecord_secure_session_reset));
} else if (isLokiSessionRestoreDone()) {
- return emphasisAdded(context.getString(R.string.MessageRecord_session_restore_done));
+ return emphasisAdded(context.getString(R.string.view_reset_secure_session_done_message));
} else if (SmsDatabase.Types.isEndSessionType(type)) {
return emphasisAdded(context.getString(R.string.ThreadRecord_secure_session_reset));
} else if (MmsSmsColumns.Types.isLegacyType(type)) {