Patches for Email Delay Check [sf#1163442] [#562]