diff --git a/js/modules/types/attachment.js b/js/modules/types/attachment.js
index 5010f87fc..142015265 100644
--- a/js/modules/types/attachment.js
+++ b/js/modules/types/attachment.js
@@ -179,4 +179,5 @@ exports.deleteData = deleteAttachmentData => {
   };
 };
 
+exports.isVoiceMessage = AttachmentTS.isVoiceMessage;
 exports.save = AttachmentTS.save;
diff --git a/js/views/attachment_view.js b/js/views/attachment_view.js
index 798039e7c..15654e82b 100644
--- a/js/views/attachment_view.js
+++ b/js/views/attachment_view.js
@@ -5,7 +5,6 @@
 
 /* global i18n: false */
 /* global Signal: false */
-/* global textsecure: false */
 /* global Whisper: false */
 
 // eslint-disable-next-line func-names
@@ -119,20 +118,7 @@
       Signal.Backbone.Views.Lightbox.show(this.lightboxView.el);
     },
     isVoiceMessage() {
-      if (
-        // eslint-disable-next-line no-bitwise
-        this.model.flags &
-        textsecure.protobuf.AttachmentPointer.Flags.VOICE_MESSAGE
-      ) {
-        return true;
-      }
-
-      // Support for android legacy voice messages
-      if (this.isAudio() && this.model.fileName === null) {
-        return true;
-      }
-
-      return false;
+      return Signal.Types.Attachment.isVoiceMessage(this.model);
     },
     isAudio() {
       const { contentType } = this.model;