Start new unit test, move dieOnFatalError into model as it is the only one using it, and it removes a dependency on mail_common in model, small app_messages reference changes to make it easier to run without htmlCacheRestoreDetectedActivity being set