Merge branch 'hotfix/fix-default-emoticon-set'
Merge branch 'release/0.2'
Recompute messages only when needed