Oh, nice. I looked under Settings > Privacy and didn’t see anything. For me it was under Settings > Data Usage.
Yes, this still an issue if you manually download an attachment, but that’s a lot better than automatically when you open a conversation.