Merge remote-tracking branch 'chiiph/bug/properly_stop_imap' into develop
Refactor keyring usage and fix saving problem