Contact form : fixing #16 #15 #4