fixes to keyring management

the way passwords are saved changes to use tuples of imap/smtp
hosts with the same password for the same account entry.
In case the password would be different then two account entries
should be used, else the same one is used for all hosts indicated
in the entry.