Adding messages and editMode