 		attributedText: NSAttributedString?, fromFrame frame: CGRect) -> UILabel
 	{
 		var captionFont = UIFont.systemFontOfSize(14)
-		var captionSize: CGSize = CGSizeZero
+		var captionSize = CGSizeZero
 		
 		if let pt = plainText {
-			captionSize = pt.boundingRectWithSize(CGSizeMake(frame.size.width, CGFloat(MAXFLOAT)), options: .UsesLineFragmentOrigin,
+			captionSize = pt.boundingRectWithSize(CGSizeMake(frame.size.width - 2 * captionPadding, CGFloat(MAXFLOAT)), options: .UsesLineFragmentOrigin,
 				attributes: [NSFontAttributeName: captionFont], context: nil).size
 		}
 		if let at = attributedText {

		
		var captionLabel = self.captionLabelWithPlainText(plainText, orAttributedText:nil, fromFrame:frame)
		
		var backgroundView = UIView(frame: captionLabel.frame)
		backgroundView.backgroundColor = UIColor.blackColor()
		backgroundView.alpha = 0.6
		
		var captionFrame = CGRectMake(0, frame.size.height-captionLabel.frame.size.height,
			captionLabel.frame.size.width, captionLabel.frame.size.height)
		
		self.frame = captionFrame
		
		self.backgroundColor = UIColor.clearColor()
		self.autoresizingMask = .FlexibleTopMargin | .FlexibleWidth
			

		
		var captionLabel = self.captionLabelWithPlainText(nil, orAttributedText:attributedText, fromFrame:frame)
		
		var captionFrame = CGRectMake(0, frame.size.height - captionLabel.frame.size.height - 2 * captionPadding,
			captionLabel.frame.size.width + 2 * captionPadding, captionLabel.frame.size.height + 2 * captionPadding)
		
		self.frame = captionFrame
		
		var backgroundView = UIView(frame: self.bounds)
		backgroundView.backgroundColor = UIColor.blackColor()
		backgroundView.alpha = 0.6
		
		self.backgroundColor = UIColor.clearColor()
		self.autoresizingMask = .FlexibleTopMargin | .FlexibleWidth
		
		self.addSubview(backgroundView)
		self.addSubview(captionLabel)
	}
