Issue/515

Can be considered completed, but need to be integrated in master when discussion in the issue: https://github.com/globaleaks/GlobaLeaks/issues/515 is completed