addressed issue https://github.com/globaleaks/GlobaLeaks/issues/933
Merge pull request #124 from globaleaks/issues/933

addressed issue https://github.com/globaleaks/GlobaLeaks/issues/933
applyied kingu texts suggestions
implemented https://github.com/globaleaks/GlobaLeaks/issues/953
minor fix needed for https://github.com/globaleaks/GlobaLeaks/issues/951