I don't know what the proper thing to do, but I usually put my cover letter in the body of the e-mail and then attach my resume (unless otherwise stated).