diff --git a/adapters/mail/src/message.ts b/adapters/mail/src/message.ts
index 98b1ec0f..3e962e95 100644
--- a/adapters/mail/src/message.ts
+++ b/adapters/mail/src/message.ts
@@ -39,40 +39,21 @@ export class MailMessageEncoder extends MessageEncoder<MailBot> {
     const { type, attrs, children } = element
     if (type === 'text') {
       this.buffer += attrs.content
-    } else if (type === 'b' || type === 'strong') {
-      this.buffer += '<b>'
+    } else if (['b', 'strong', 'i', 'em', 'u', 'ins', 's', 'del', 'p', 'code', 'li', 'ul', 'ol', 'blockquote'].includes(type)) {
+      this.buffer += `<${type}>`
       await this.render(children)
-      this.buffer += '</b>'
-    } else if (type === 'i' || type === 'em') {
-      this.buffer += '<i>'
-      await this.render(children)
-      this.buffer += '</i>'
-    } else if (type === 'u' || type === 'ins') {
-      this.buffer += '<u>'
-      await this.render(children)
-      this.buffer += '</u>'
-    } else if (type === 's' || type === 'del') {
-      this.buffer += '<s>'
-      await this.render(children)
-      this.buffer += '</s>'
-    } else if (type === 'code') {
-      this.buffer += '<code>'
-      await this.render(children)
-      this.buffer += '</code>'
+      this.buffer += `</${type}>`
     } else if (type === 'a') {
       this.buffer += `<a href=${attrs.href}>`
       await this.render(children)
       this.buffer += `</a>`
-    } else if (type === 'p') {
-      await this.render(children)
-      this.buffer += `\n`
     } else if (type === 'at') {
       if (attrs.id) {
         this.buffer += `<a href="mailto:${attrs.id}">@${attrs.id}</a>`
       }
     } else if (type === 'sharp' && attrs.id) {
       this.buffer += ` #${attrs.id} `
-    } else if (type === 'image' && attrs.url) {
+    } else if (['image', 'audio', 'video', 'file'].includes(type) && attrs.url) {
       let url: string
       if (attrs.url.match(/^https?:/)) {
         url = attrs.url
@@ -87,7 +68,13 @@ export class MailMessageEncoder extends MessageEncoder<MailBot> {
         })
         url = `cid:${cid}`
       }
-      this.buffer += `<img src="${url}"/>`
+      if (type === 'image') {
+        this.buffer += `<img src="${url}" />`
+      } else if (type === 'audio') {
+        this.buffer += `<audio src="${url}" controls />`
+      } else if (type === 'video') {
+        this.buffer += `<video src="${url}" controls />`
+      }
     } else if (type === 'quote') {
       this.reply = attrs.id
     } else if (type === 'message') {