some fixes for edit
Merge branch 'master' of github.com:open-keychain/open-keychain
Merge branch 'master' of github.com:open-keychain/open-keychain