Fix expiring sent-mail label if identity ID changes
[mms] Fix expiring session cached mailbox data when mailbox information changes.

Conflicts:
	imp/docs/CHANGES
	imp/package.xml
More fixes for expire()