Replaced nasty eval() expressions.
Merge branch 'master' of https://github.com/roundcube/roundcubemail