Use attachment content disposition attachment and filename. 

Fixes #2407