Old Keys are not overwritten

[mbenlioglu]

Problem

    Old keys from server, and/or clients with same email are not overwritten and may cause issues during encryption/decryption. Need to adapt a better key model.