Email won't sync while on wifi (galaxy S6)

A

AC Question

I just updated from galaxy S3 to S6. However, I have noticed that now when I am connected to wifi, my "Email" app will not sync. As soon as I turn off wifi, it quickly syncs.
When I first got my S3 I remember struggling to send MMS messages while on wifi, but was able to discover the setting that forces the phone to switch connection types as needed. So now I am trying to locate that same type of setting.

I did find the new "smart network switch" and have it turned on, but this doesn't solve my issue. Has anyone else had this issue?