Tweaks and new smtp google account
merge conflicts