-set my_markdown_extensions="admonition,codehilite,sane_lists,smarty,pymdownx.extra,pymdownx.highlight,pymdownx.critic,pymdownx.keys,pymdownx.magiclink,pymdownx.mark,pymdownx.saneheaders,pymdownx.smartsymbols"
-macro compose y "<enter-command> source '$my_confdir/buildmimetree.py --extensions $my_markdown_extensions --tempdir $tmpdir --only-build --css-file $my_confdir/htmlmail.css|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
-bind compose Y send-message
+set pager_format="<%a> %* %J (%P)"
+
+set my_markdown_extensions="admonition,codehilite,sane_lists,smarty,pymdownx.extra,pymdownx.highlight,pymdownx.critic,pymdownx.keys,pymdownx.magiclink,pymdownx.mark,pymdownx.saneheaders,pymdownx.smartsymbols,nl2br"
+macro compose y "<enter-command> source '$my_confdir/buildmimetree.py --extensions $my_markdown_extensions --tempdir $tmpdir --css-file $my_confdir/htmlmail.css --domain madduck.net|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
+macro compose Y "<enter-command> source '$my_confdir/buildmimetree.py --just-build --max-number-other-attachments 100 --extensions $my_markdown_extensions --tempdir $tmpdir --css-file $my_confdir/htmlmail.css --domain madduck.net|'<enter><enter-command> source \$my_mdwn_postprocess_cmd_file<enter>" "Convert message into a modern MIME tree with inline images"
+bind compose \Cy send-message