Removed invalid @todo and replaced account.message with account.notifications