Improved email queue init