FIXED: a bug with the key exchange.

Key exchange was messing up since the wrong id was passed to the update number method which failed since it was using the wrong id. Also, added a programmatic rule (if the contact is trusted) to adjust the layout for EditNumber if the contact is trusted.