Refactored storage properties setting
Merge branch 'master' of github.com:roundcube/roundcubemail