Merge branch 'refs/heads/pr/90' into next

# Conflicts:

#	files/lib/data/conversation/message/ConversationMessageAction.class.php
#	files/lib/form/ConversationMessageEditForm.class.php

diff --cc files/lib/data/conversation/ConversationAction.class.php
Simple merge

diff --cc files/lib/data/conversation/message/ConversationMessageAction.class.php
Simple merge

diff --cc files/lib/form/ConversationAddForm.class.php
Simple merge