Fix translation of messages with additional content