Support 'keep' action (#1489226)
Fix regexp escaping
Merge branch 'master' of github.com:roundcube/roundcubemail
Fix XSS vulnerability when editing a message "as new" or draft (#1489251) - added HTML content "washing"
Fix fatal error when opening non-existing message in compose window