Fix for recent removal of 'MAIL_ITEM' identifier from core code.