Further improvement for newlines after attachments