Feature/email app public #354

Test fix