implemented feature https://github.com/globaleaks/GlobaLeaks/issues/1004
Merge pull request #136 from globaleaks/feature/1004

implemented feature https://github.com/globaleaks/GlobaLeaks/issues/1004