Merge pull request #1299 from Arantor/release-2.1

! Missing query parameter, thanks to jasonclemons. Fixes #1298
Merge pull request #1300 from Arantor/release-2.1

! For attachment limits below 1MB, use KB like we always used to, for at...