-{if #replyto#}{add_header name='Reply-To' value=#replyto#}{/if}
-{if #retpath#}{add_header name='Return-Path' value=#retpath#}{/if}
-{else}
+{if isset(#replyto#)}{add_header name='Reply-To' value=#replyto#}{/if}
+{if isset(#retpath#)}{add_header name='Return-Path' value=#retpath#}{/if}
+{elseif $mail_part eq 'text'}
+{if !$is_mail}