Contact me and Mail function fixes