Restore some ok toasts
Prevent infinite loop when converting text messages to HTML
Merge remote-tracking branch 'brice/master' & build