RFR-Jg fog email

Email functionality working properly for local branch
done, and another no