implemented and test of https://github.com/globaleaks/GlobaLeaks/issues/...

https://github.com/globaleaks/GlobaLeaks/issues/620