diff --git a/Yep/ViewControllers/Conversation/ConversationViewController.swift b/Yep/ViewControllers/Conversation/ConversationViewController.swift
index acefcda5..937d586a 100644
--- a/Yep/ViewControllers/Conversation/ConversationViewController.swift
+++ b/Yep/ViewControllers/Conversation/ConversationViewController.swift
@@ -705,7 +705,7 @@ class ConversationViewController: BaseViewController {
         conversationCollectionView.registerClass(ChatRightAudioCell.self, forCellWithReuseIdentifier: chatRightAudioCellIdentifier)
 
         conversationCollectionView.registerClass(ChatLeftVideoCell.self, forCellWithReuseIdentifier: chatLeftVideoCellIdentifier)
-        conversationCollectionView.registerClass(ChatRightVideoCell.self, forCellWithReuseIdentifier: chatRightAudioCellIdentifier)
+        conversationCollectionView.registerClass(ChatRightVideoCell.self, forCellWithReuseIdentifier: chatRightVideoCellIdentifier)
 
         conversationCollectionView.registerClass(ChatLeftLocationCell.self, forCellWithReuseIdentifier: chatLeftLocationCellIdentifier)
         conversationCollectionView.registerClass(ChatRightLocationCell.self, forCellWithReuseIdentifier: chatRightLocationCellIdentifier)
diff --git a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
index 9de28e24..12acd130 100644
--- a/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
+++ b/Yep/Views/Cells/ChatRightAudio/ChatRightAudioCell.swift
@@ -47,7 +47,8 @@ class ChatRightAudioCell: ChatRightBaseCell {
 
     lazy var audioDurationLabel: UILabel = {
         let label = UILabel()
-        label.textColor = UIColor.blackColor()
+        label.textAlignment = .Center
+        label.textColor = UIColor.whiteColor()
         return label
     }()
 
@@ -165,6 +166,11 @@ class ChatRightAudioCell: ChatRightBaseCell {
                 audioDurationLabel.text = ""
             }
 
+            bubbleImageView.frame = audioContainerView.bounds
+            playButton.frame = CGRect(x: 6, y: 5, width: 30, height: 30)
+            sampleView.frame = CGRect(x: 41, y: 0, width: audioContainerView.bounds.width - 60, height: audioContainerView.bounds.height)
+            audioDurationLabel.frame = sampleView.frame
+
             if let audioPlayer = YepAudioService.sharedManager.audioPlayer {
                 if audioPlayer.playing {
                     if let playingMessage = YepAudioService.sharedManager.playingMessage {