Same ignore as in master and also your changes from master

Hi,

I just "ported" or better picked your changes from master to rc-0.8 as we are using new roundcube on our installation.