implemeneted feature https://github.com/globaleaks/GlobaLeaks/issues/980
Merge branch 'devel' of github.com:globaleaks/GlobaLeaks into devel