#2174 Limiting attachments to 0 doesn't do what is expected (backport)
Merge pull request #2330 from xillibit/k30_bugs8

#2174 Limiting attachments to 0 doesn't do what is expected (backport)