diff --git a/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachment.m b/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachment.m
index f3722bd80..3d92cdca8 100644
--- a/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachment.m	
+++ b/SessionMessagingKit/Sending & Receiving/Attachments/TSAttachment.m	
@@ -185,7 +185,7 @@ NSUInteger const TSAttachmentSchemaVersion = 4;
         if (self.isVoiceMessage || !self.sourceFilename || self.sourceFilename.length == 0) {
             attachmentString = NSLocalizedString(@"ATTACHMENT_TYPE_VOICE_MESSAGE",
                 @"Short text label for a voice message attachment, used for thread preview and on the lock screen");
-            return [NSString stringWithFormat:@"🎤 %@", attachmentString];
+            return [NSString stringWithFormat:@"🎙️ %@", attachmentString];
         }
     }
 
diff --git a/SessionMessagingKit/Sending & Receiving/MessageSender.swift b/SessionMessagingKit/Sending & Receiving/MessageSender.swift
index fcb4f1a54..dd44c8197 100644
--- a/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
+++ b/SessionMessagingKit/Sending & Receiving/MessageSender.swift	
@@ -59,6 +59,7 @@ public final class MessageSender : NSObject {
         signalAttachments.forEach {
             let attachment = TSAttachmentStream(contentType: $0.mimeType, byteCount: UInt32($0.dataLength), sourceFilename: $0.sourceFilename,
                 caption: $0.captionText, albumMessageId: tsMessage.uniqueId!)
+            attachment.attachmentType = $0.isVoiceMessage ? .voiceMessage : .default
             attachments.append(attachment)
             attachment.write($0.dataSource)
             attachment.save(with: transaction)