 
     override func updateView() {
         super.updateView()
-        statusTextFieldNibView?.iconView?.hidden = status == .None
+        statusTextFieldNibView?.iconView?.hidden = status == .Normal
         statusTextFieldNibView?.iconView?.tintColor = status.color
-        var borderStatus = status
-        if borderStatus == .None && editing {
-            borderStatus = .Editing
-        }
         statusTextFieldNibView?.borderView?.backgroundColor = borderStatus.color
-        statusTextFieldNibView?.messageLabel?.textColor = status.color
-        // TODO: Animate:
-        if isPlaceholderAtTitle {
-            statusTextFieldNibView?.titleLabel?.text = super.placeholder
-        } else {
-            statusTextFieldNibView?.titleLabel?.text = " " // Needs some text for AutoLayout positioning.
+        statusTextFieldNibView?.messageLabel?.textColor = messageColor
+        if title == nil {
+            // TODO: Animate:
+            if isPlaceholderAtTitle {
+                statusTextFieldNibView?.titleLabel?.text = super.placeholder
+            } else {
+                statusTextFieldNibView?.titleLabel?.text = " " // Needs some text for AutoLayout positioning.
+            }
         }
     }
 


    override var placeholder: String? {
        get {
            return isPlaceholderAtTitle ? nil : super.placeholder
        }
        set {
            super.placeholder = newValue
        }
    }
    

            return status.rawValue
        }
        set {
            status = ControlStatus(rawValue: newValue) ?? .Normal
        }
    }

    // MARK: - Computed variables
    
    var messageColor: UIColor {
        return status.color
    }
    
    var borderStatus: ControlStatus {
        return status == .Normal && editing ? .Editing : status
    }
    
    // MARK: - Private variables
    
    private var externalDelegate: UITextFieldDelegate?
    
    private var isPlaceholderAtTitle: Bool {
        return text?.characters.count > 0
    }
    
    private var statusTextFieldNibView: StatusTextFieldNibView? {
        return contentView as? StatusTextFieldNibView
    }
    
    // MARK: - Init

    override func commonInit() {
        super.commonInit()
        statusTextFieldNibView?.titleLabel?.text = nil
        message = nil
        status = .Normal
        super.delegate = self
    }
    
