Do new line w/o any border fixes #2469

Signed-off-by: Antes <antes@simplemachines.org>
! Only certain settings should be considered pruningOptions... (fixes #2477)

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2480 from Oldiesmann/release-2.1

! Only certain settings should be considered pruningOptions... (fixes #2477)
Merge pull request #2479 from Antes/paw_stuff

Don't create new line for attachments
image compression - signed off by Pierre Lavaux <pierre.lvx@gmail.com>
Merge pull request #2482 from PierreLvx/release-2.1

Image compression