         avatarImageView.center = CGPoint(x: fullWidth - halfAvatarSize - YepConfig.chatCellGapBetweenWallAndAvatar(), y: halfAvatarSize)
     }
 
-    override func awakeFromNib() {
-        super.awakeFromNib()
-        
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+
+        contentView.addSubview(messageImageView)
+        contentView.addSubview(borderImageView)
+
         UIView.performWithoutAnimation { [weak self] in
             self?.makeUI()
         }
 
-        messageImageView.tintColor = UIColor.rightBubbleTintColor()
-        messageImageView.maskView = messageImageMaskImageView
-        
         messageImageView.userInteractionEnabled = true
         let tap = UITapGestureRecognizer(target: self, action: "tapMediaView")
         messageImageView.addGestureRecognizer(tap)


class ChatRightImageCell: ChatRightBaseCell {

    @IBOutlet weak var messageImageView: UIImageView!
    @IBOutlet weak var borderImageView: UIImageView!

    typealias MediaTapAction = () -> Void
    var mediaTapAction: MediaTapAction?

        prepareForMenuAction = { otherGesturesEnabled in
            tap.enabled = otherGesturesEnabled
        }
    }

    required init?(coder aDecoder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }

    func tapMediaView() {
