diff --git a/app/js/directives.js b/app/js/directives.js
index 21c6439e..0078904f 100644
--- a/app/js/directives.js
+++ b/app/js/directives.js
@@ -203,11 +203,6 @@ angular.module('myApp.directives', ['myApp.filters'])
       }
     };
   })
-  .directive('myMessageAudio', function() {
-    return {
-      templateUrl: templateUrl('message_attach_audio')
-    };
-  })
   .directive('myMessageMap', function() {
     return {
       templateUrl: templateUrl('message_attach_map')
diff --git a/app/partials/desktop/message.html b/app/partials/desktop/message.html
index c854165c..b24250b8 100644
--- a/app/partials/desktop/message.html
+++ b/app/partials/desktop/message.html
@@ -53,7 +53,7 @@
           <div ng-switch-when="messageMediaPhoto"     my-message-photo></div>
           <div ng-switch-when="messageMediaVideo"     my-message-video></div>
           <div ng-switch-when="messageMediaDocument"  my-message-document="historyMessage.media.document" message-id="historyMessage.id"></div>
-          <div ng-switch-when="messageMediaAudio"     my-message-audio></div>
+          <div ng-switch-when="messageMediaAudio"     class="im_message_audio" my-audio-player audio="historyMessage.media.audio"></div>
           <div ng-switch-when="messageMediaGeo"       my-message-map></div>
           <div ng-switch-when="messageMediaContact"   my-message-contact></div>
           <div ng-switch-when="messageMediaPending"   my-message-pending></div>
diff --git a/app/partials/desktop/message_attach_audio.html b/app/partials/desktop/message_attach_audio.html
deleted file mode 100644
index 14982b4f..00000000
--- a/app/partials/desktop/message_attach_audio.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="im_message_audio">
-  <div my-audio-player audio="historyMessage.media.audio"></div>
-</div>
diff --git a/app/partials/mobile/message.html b/app/partials/mobile/message.html
index 8a3197c6..1be7c686 100644
--- a/app/partials/mobile/message.html
+++ b/app/partials/mobile/message.html
@@ -42,8 +42,8 @@
 
           <div ng-switch-when="messageMediaPhoto"     my-message-photo></div>
           <div ng-switch-when="messageMediaVideo"     my-message-video></div>
-          <div ng-switch-when="messageMediaDocument"  my-message-document></div>
-          <div ng-switch-when="messageMediaAudio"     my-message-audio></div>
+          <div ng-switch-when="messageMediaDocument"  my-message-document="historyMessage.media.document" message-id="historyMessage.id"></div>
+          <div ng-switch-when="messageMediaAudio"     class="im_message_audio" my-audio-player audio="historyMessage.media.audio"></div>
           <div ng-switch-when="messageMediaGeo"       my-message-map></div>
           <div ng-switch-when="messageMediaContact"   my-message-contact></div>
           <div ng-switch-when="messageMediaPending"   my-message-pending></div>
diff --git a/app/partials/mobile/message_attach_audio.html b/app/partials/mobile/message_attach_audio.html
deleted file mode 100644
index 14982b4f..00000000
--- a/app/partials/mobile/message_attach_audio.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div class="im_message_audio">
-  <div my-audio-player audio="historyMessage.media.audio"></div>
-</div>