edit message will be send on conversation end
Merge branch 'revision' into development

Conflicts:
	threader/threader.js