diff --git a/app/main/views/conversation.py b/app/main/views/conversation.py
index 347370c71..8f32fba1e 100644
--- a/app/main/views/conversation.py
+++ b/app/main/views/conversation.py
@@ -64,7 +64,7 @@ def get_sms_thread(service_id, user_number):
     ), key=lambda notification: notification['created_at']):
 
         is_inbound = ('notify_number' in notification)
-        redact_personalisation = notification.get('template', {}).get('redact_personalisation', False)
+        redact_personalisation = not is_inbound and notification['template']['redact_personalisation']
 
         if redact_personalisation:
             notification['personalisation'] = {}
diff --git a/tests/app/main/views/test_conversation.py b/tests/app/main/views/test_conversation.py
index b8c85dad8..5076b9bb5 100644
--- a/tests/app/main/views/test_conversation.py
+++ b/tests/app/main/views/test_conversation.py
@@ -22,7 +22,8 @@ def test_get_user_phone_number_when_only_inbound_exists(mocker):
     mock_get_inbound_sms = mocker.patch(
         'app.main.views.conversation.service_api_client.get_inbound_sms_by_id',
         return_value={
-            'user_number': '4407900900123'
+            'user_number': '4407900900123',
+            'notify_number': '07900000002'
         }
     )
     mock_get_notification = mocker.patch(
@@ -104,35 +105,35 @@ def test_view_conversation(
     for index, expected in enumerate([
         (
             'message-8',
-            'Failed (sent yesterday at 2:59pm)',
+            'yesterday at 2:59pm',
         ),
         (
             'message-7',
-            'Failed (sent yesterday at 2:59pm)',
+            'yesterday at 2:59pm',
         ),
         (
             'message-6',
-            'Failed (sent yesterday at 4:59pm)',
+            'yesterday at 4:59pm',
         ),
         (
             'message-5',
-            'Failed (sent yesterday at 6:59pm)',
+            'yesterday at 6:59pm',
         ),
         (
             'message-4',
-            'Failed (sent yesterday at 8:59pm)',
+            'yesterday at 8:59pm',
         ),
         (
             'message-3',
-            'Failed (sent yesterday at 10:59pm)',
+            'yesterday at 10:59pm',
         ),
         (
             'message-2',
-            'Failed (sent yesterday at 10:59pm)',
+            'yesterday at 10:59pm',
         ),
         (
             'message-1',
-            'Failed (sent yesterday at 11:00pm)',
+            'yesterday at 11:00pm',
         ),
         (
             expected_outbound_content,
@@ -198,6 +199,7 @@ def test_view_conversation_with_empty_inbound(
         'app.main.views.conversation.service_api_client.get_inbound_sms',
         return_value=[{
             'user_number': '07900000001',
+            'notify_number': '07900000002',
             'content': '',
             'created_at': datetime.utcnow().isoformat(),
             'id': fake_uuid
diff --git a/tests/conftest.py b/tests/conftest.py
index e5ca3fdd5..ed93ead64 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1333,6 +1333,7 @@ def mock_get_inbound_sms(mocker):
     ):
         return [{
             'user_number': '0790090000' + str(i),
+            'notify_number': '07900000002',
             'content': 'message-{}'.format(index + 1),
             'created_at': (datetime.utcnow() - timedelta(minutes=60 * (i + 1), seconds=index)).isoformat(),
             'id': sample_uuid(),