Email scheduling branch merge.

Email scheduling  for active & inactive user.