refactor imap fetch
Merge remote-tracking branch 'kali/feature/3423_refactor_imap_fetch' into develop