             var contentHeight = self.contentView.frame.height
             
             var bubbleHeight = contentHeight - bubbleTopPadding - bubbleBottomPadding
-            var bubbleWidth = CGFloat(221)
+            var bubbleWidth = CGFloat(201)
             
             if (self.isOut) {
                 self.bubble.frame = CGRectMake(contentWidth - bubbleWidth - self.bubblePadding, bubbleTopPadding, bubbleWidth, bubbleHeight)
                 
-                self.dateText.frame = CGRectMake(self.bubble.frame.maxX - 70 - self.bubblePadding, self.bubble.frame.maxY - 24, 46, 26)
-                self.dateText.textColor = self.dateColorOut
+                self.dateLabel.frame = CGRectMake(self.bubble.frame.maxX - 70 - self.bubblePadding, self.bubble.frame.maxY - 24, 46, 26)
+                self.dateLabel.textColor = self.dateColorOut
+                
+                self.titleLabel.frame = CGRect(x: self.bubble.frame.minX + 76.0, y: 25.0, width: bubbleWidth - 76.0 - 8.0 - 6.0, height: self.titleLabel.bounds.height)
+                self.sizeLabel.frame = CGRect(x: self.bubble.frame.minX + 76.0, y: 47.0, width: self.titleLabel.bounds.width, height: self.sizeLabel.bounds.height)
             } else {
                 self.bubble.frame = CGRectMake(self.bubblePadding, bubbleTopPadding, bubbleWidth, bubbleHeight)
                 
-                self.dateText.frame = CGRectMake(self.bubble.frame.maxX - 47 - self.bubblePadding, self.bubble.frame.maxY - 24, 46, 26)
-                self.dateText.textColor = self.dateColorIn
+                self.dateLabel.frame = CGRectMake(self.bubble.frame.maxX - 47 - self.bubblePadding, self.bubble.frame.maxY - 24, 46, 26)
+                self.dateLabel.textColor = self.dateColorIn
+                
+                self.titleLabel.frame = CGRect(x: self.bubble.frame.minX + 82.0, y: 25.0, width: bubbleWidth - 82.0 - 8.0, height: self.titleLabel.bounds.height)
+                self.sizeLabel.frame = CGRect(x: self.bubble.frame.minX + 82.0, y: 47.0, width: self.titleLabel.bounds.width, height: self.sizeLabel.bounds.height)
             }
-            
             
             if (self.isOut) {
                 self.statusView.frame = CGRectMake(self.bubble.frame.maxX - 24 - self.bubblePadding, self.bubble.frame.maxY - 24, 20, 26)

    // MARK: Bind
    
    override func bind(message: AMMessage, reuse: Bool) {
        if (!reuse) {
            isOut = message.getSenderId() == MSG.myUid()
            if (isOut) {

    // MARK: Private vars
    
    private let bubble = UIImageView()
    
    private let titleLabel = UILabel()
    private let sizeLabel = UILabel()
    
    private let dateLabel = UILabel()
    private let statusView = UIImageView()
    
    private var isOut: Bool = false
