fixed #903 and bug in contact us message