Refactored MailStorageQueue.