Feature/edit message