 			}
 			else if row.key as? String == "add-message" {
 
-				let empty = JSMStaticTextPreference(key: String(indexPath.row))
-				empty.value = nil
-				empty.textField?.placeholder = "Message Text"
-				empty.textField?.returnKeyType = .Done
-				empty.canBeMoved = true
-				empty.canBeDeleted = true
-				empty.fitControlToCell = true
-                empty.configurationForCell { row, cell in
-                    if let preference = row as? JSMStaticTextPreference, let font = cell.textLabel?.font {
-                        preference.textField?.font = font
-                    }
-                }
-                empty.addObserver(self)
-
+				let empty = self._rowForMessage(nil, key: String(indexPath.row))
                 dataSource.insertRow(empty, intoSection: row.section, atIndex: UInt(indexPath.row), withRowAnimation: UITableViewRowAnimation.Bottom)
 				empty.textField?.becomeFirstResponder()
 

		section.addRow(row)
	}

	/// Generates a list of messages in the messages section, and saves them, using the PreferencesManager.
	private func _saveMessages() {
		if let preferences = self.preferences, let rows = self.dataSource?.sectionWithKey("messages")?.rows {

        }

		for message in preferences.messages {
			let row = self._rowForMessage(message, key: message)
			section.addRow(row)
		}

