Working on fix for mod mail refresh bug

No complete.