File Attachments and Email Reply-To Header

I've been having issues with both file attachments and the email Reply-To header since installing one of the 7.x-4.x upgrades. I'm not sure which version is associated with the start of the problems, but I can confirm that I'm seeing this behavior with 7.x-4.7.

Attachments: I have my webform set up with three file upload fields. The files are uploaded without error, but they're not being included as attachments.I'm using a custom template and I have "Include files as attachments" checked. "Send e-mail as HTML" is not checked. My site-wide default mail system is "DefaultMailSystem". MimeMail is set to use "MimeMailSystem". What might be causing this behavior?

Reply-To: As noted in this thread, the Reply-To header for the email I receive when a form is submitted is the sender address for my site. I want it to be the email address of the form submitter. I have the webform set to use a submitter's email address component for the "E-mail from address" and a submitter name component for the "E-mail from name". "Use Reply-To header" is checked on the WebForm settings (admin/config/content/webform) page. Do I have this set correctly? If not, what should I change?