ADD: class MailMessage
FIX: removed unnecessary field
FIX: removed TODO
ADD: new class RestoreItem for key/values