tempmail_sdk 1.3.3 → 1.3.4

data/lib/tempmail_sdk/providers/fakemail.rb

@@ -0,0 +1,143 @@
+# frozen_string_literal: true
+
+require "json"
+require "uri"
+
+module TempmailSdk
+  module Providers
+    # fakemail.net 渠道实现（与 disposablemail.com 共享 PHP API 结构）
+    #
+    # 流程：
+    #   1. GET / 获取 session cookie + HTML 中的 CSRF token（const CSRF = "xxx"）
+    #   2. GET /index/index?csrf_token={csrf} 创建邮箱，返回 {"email":"...","heslo":"..."}
+    #   3. GET /index/refresh 携带 session cookie 获取邮件列表（捷克语字段: predmet/od/kdy/precteno）
+    #   4. POST /index/email（body: id={id}）获取邮件 HTML 正文
+    # token 存储 session cookie 字符串
+    module Fakemail
+      CHANNEL = "fakemail"
+      BASE_URL = "https://www.fakemail.net"
+
+      CSRF_RE = /const\s+CSRF\s*=\s*"([^"]+)"/.freeze
+
+      BROWSER_HEADERS = {
+        "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "User-Agent" => "Mozilla/5.0"
+      }.freeze
+
+      AJAX_HEADERS = {
+        "Accept" => "application/json, text/javascript, */*; q=0.01",
+        "Referer" => "#{BASE_URL}/",
+        "User-Agent" => "Mozilla/5.0",
+        "X-Requested-With" => "XMLHttpRequest"
+      }.freeze
+
+      module_function
+
+      # 合并 Set-Cookie 为 Cookie 字符串
+      def merge_cookies(existing, resp)
+        jar = {}
+        existing.to_s.split(";").each do |part|
+          part = part.strip
+          next unless part.include?("=")
+
+          k, v = part.split("=", 2)
+          jar[k.strip] = v.to_s
+        end
+        resp.set_cookies.each do |line|
+          first = line.split(";", 2).first.to_s.strip
+          next unless first.include?("=")
+
+          k, v = first.split("=", 2)
+          jar[k.strip] = v.to_s
+        end
+        jar.map { |k, v| "#{k}=#{v}" }.join("; ")
+      end
+
+      # 去除 UTF-8 BOM
+      def clean_json(body)
+        body = body.dup.force_encoding("BINARY")
+        body = body[3..] if body.start_with?("\xEF\xBB\xBF".b)
+        body.force_encoding("UTF-8")
+      end
+
+      # 创建临时邮箱
+      # @return [EmailInfo]
+      def generate_email
+        r1 = Http.get("#{BASE_URL}/", headers: BROWSER_HEADERS)
+        r1.raise_for_status
+        cookie = merge_cookies("", r1)
+        m = r1.body.match(CSRF_RE)
+        raise "fakemail: csrf token not found" unless m
+
+        csrf = m[1]
+        r2 = Http.get("#{BASE_URL}/index/index?csrf_token=#{URI.encode_www_form_component(csrf)}",
+                      headers: AJAX_HEADERS.merge(cookie.empty? ? {} : { "Cookie" => cookie }))
+        r2.raise_for_status
+        cookie = merge_cookies(cookie, r2)
+
+        data = JSON.parse(clean_json(r2.body))
+        email = data["email"].to_s.strip
+        raise "fakemail: invalid mailbox response" if email.empty? || !email.include?("@")
+
+        EmailInfo.new(channel: CHANNEL, email: email, token: cookie)
+      end
+
+      # 获取邮件列表
+      # @param token [String] session cookie 字符串
+      # @param email [String]
+      # @return [Array<Email>]
+      def get_emails(token, email)
+        raise "fakemail: empty session token" if token.to_s.strip.empty?
+        raise "fakemail: empty email" if email.to_s.strip.empty?
+
+        headers = AJAX_HEADERS.merge("Cookie" => token)
+        resp = Http.get("#{BASE_URL}/index/refresh", headers: headers)
+        resp.raise_for_status
+
+        rows = begin
+          JSON.parse(clean_json(resp.body))
+        rescue JSON::ParserError
+          []
+        end
+        return [] unless rows.is_a?(Array) && !rows.empty?
+
+        rows.map do |row|
+          id = row["id"].to_s
+          detail = fetch_detail(token, id) unless id.empty?
+          subject = detail&.dig("predmet").to_s
+          subject = row["predmet"].to_s if subject.empty?
+          from_addr = detail&.dig("od").to_s
+          from_addr = row["od"].to_s if from_addr.empty?
+          html_body = detail&.dig("telo").to_s
+          Normalize.normalize_email({
+            "id" => id,
+            "from" => from_addr,
+            "to" => email,
+            "subject" => subject,
+            "html" => html_body,
+            "date" => row["kdy"].to_s,
+            "isRead" => row["precteno"] == "precteno"
+          }, email)
+        end
+      end
+
+      # 获取单封邮件详情
+      def fetch_detail(cookie, id)
+        return nil if id.empty?
+
+        form = "id=#{URI.encode_www_form_component(id)}"
+        resp = Http.post("#{BASE_URL}/index/email",
+                         headers: AJAX_HEADERS.merge(
+                           "Content-Type" => "application/x-www-form-urlencoded",
+                           "Cookie" => cookie
+                         ),
+                         body: form)
+        return nil unless resp.ok?
+
+        JSON.parse(clean_json(resp.body))
+      rescue StandardError
+        nil
+      end
+    end
+  end
+end

data/lib/tempmail_sdk/providers/haribu.rb

@@ -32,7 +32,7 @@ module TempmailSdk
       SUBJECT_RE = /<span\s+class\s*=\s*["']mail_konu["'][^>]*>([\s\S]*?)<\/span>/mi
       DATE_RE = /<span\s+class\s*=\s*["']mail_zaman["'][^>]*>([\s\S]*?)<\/span>/mi
       MAIL_LINK_RE = /href\s*=\s*["']([^"']*(?:mail|read|view)[^"']*)["']/i
-      BODY_RE = /<div\s+(?:id|class)\s*=\s*["'](?:mail_icerik|icerik|mail-content|message-body)["'][^>]*>([\s\S]*?)<\/div>/mi
+      BODY_OPEN_RE = /<div\s+(?:id|class)\s*=\s*["'](?:mail_icerik|icerik|mail-content|message-body)["'][^>]*>/mi
       TAG_RE = /<[^>]+>/
 
       module_function
@@ -112,8 +112,34 @@ module TempmailSdk
         resp = Http.get(detail_url, headers: hdrs, timeout: 15)
         return "" unless resp.ok?
 
-        m = resp.body.match(BODY_RE)
-        m ? m[1].strip : ""
+        extract_body_html(resp.body)
+      end
+
+      # 使用栈式深度匹配提取正文 div 的完整内部 HTML，
+      # 避免非贪婪正则在嵌套 div 时截断正文。
+      def extract_body_html(page)
+        m = page.match(BODY_OPEN_RE)
+        return "" unless m
+
+        start = m.end(0)
+        pos = start
+        depth = 1
+        while pos < page.length && depth > 0
+          next_open = page.index("<div", pos)
+          next_close = page.index("</div>", pos)
+          break unless next_close
+
+          if next_open && next_open < next_close
+            depth += 1
+            pos = next_open + 4
+          else
+            depth -= 1
+            return page[start...next_close].strip if depth.zero?
+
+            pos = next_close + 6
+          end
+        end
+        ""
       rescue StandardError
         ""
       end

data/lib/tempmail_sdk/providers/linshiyouxiang_net.rb

@@ -0,0 +1,85 @@
+# frozen_string_literal: true
+
+require "json"
+
+module TempmailSdk
+  module Providers
+    # linshiyouxiang.net 渠道实现
+    #
+    # 流程：
+    #   1. GET / 获取 temp_mail cookie，从 HTML 正则提取 tempMailGlobal（邮箱）和 mailCodeGlobal（校验 code）
+    #   2. POST /get-messages {"email":"...","code":"..."} 获取邮件列表
+    # token 存储 mailCodeGlobal 的值（HMAC 哈希，后续请求用于校验）
+    module LinshiyouxiangNet
+      CHANNEL = "linshiyouxiang-net"
+      BASE_URL = "https://www.linshiyouxiang.net"
+
+      EMAIL_RE = /tempMailGlobal\s*=\s*'([^']+)'/.freeze
+      CODE_RE  = /mailCodeGlobal\s*=\s*'([^']+)'/.freeze
+
+      BROWSER_HEADERS = {
+        "Accept" => "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+        "Accept-Language" => "zh-CN,zh;q=0.9,en;q=0.8",
+        "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " \
+                       "(KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36"
+      }.freeze
+
+      AJAX_HEADERS = {
+        "Accept" => "application/json, text/javascript, */*; q=0.01",
+        "Accept-Language" => "zh-CN,zh;q=0.9,en;q=0.8",
+        "Content-Type" => "application/json",
+        "Origin" => BASE_URL,
+        "Referer" => "#{BASE_URL}/",
+        "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " \
+                       "(KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36",
+        "X-Requested-With" => "XMLHttpRequest"
+      }.freeze
+
+      module_function
+
+      # 创建临时邮箱
+      # @return [EmailInfo]
+      def generate_email
+        resp = Http.get("#{BASE_URL}/", headers: BROWSER_HEADERS)
+        resp.raise_for_status
+        html = resp.body
+
+        em = html.match(EMAIL_RE)
+        raise "linshiyouxiang-net: 未能从首页提取邮箱地址" unless em
+
+        email = em[1].strip
+        raise "linshiyouxiang-net: 提取的邮箱地址为空" if email.empty?
+
+        code = ""
+        if (cm = html.match(CODE_RE))
+          code = cm[1].strip
+        end
+
+        EmailInfo.new(channel: CHANNEL, email: email, token: code)
+      end
+
+      # 获取邮件列表
+      # POST /get-messages {"email":"...","code":"<token>"}
+      # @param email [String]
+      # @param token [String] mailCodeGlobal 值
+      # @return [Array<Email>]
+      def get_emails(email, token)
+        raise "linshiyouxiang-net: 邮箱地址为空" if email.to_s.strip.empty?
+
+        resp = Http.post("#{BASE_URL}/get-messages",
+                         headers: AJAX_HEADERS,
+                         json: { "email" => email, "code" => token.to_s })
+        resp.raise_for_status
+        data = resp.json
+        emails_raw = data["emails"]
+        return [] unless emails_raw.is_a?(Array) && !emails_raw.empty?
+
+        emails_raw.filter_map do |raw|
+          next unless raw.is_a?(Hash)
+
+          Normalize.normalize_email(raw, email)
+        end
+      end
+    end
+  end
+end

data/lib/tempmail_sdk/providers/mail_sunls.rb

@@ -47,7 +47,41 @@ module TempmailSdk
         EmailInfo.new(channel: CHANNEL, email: "#{local}@#{domain}")
       end
 
+      # 通过详情接口获取单封邮件完整正文
+      # GET /api/fetch/{id}
+      # 失败时返回 nil，调用方回退到列表数据
+      def fetch_detail(id)
+        mid = id.to_s.strip
+        return nil if mid.empty?
+
+        begin
+          resp = Http.get("#{BASE}/api/fetch/#{URI.encode_www_form_component(mid)}",
+                          headers: HEADERS, timeout: 15)
+          return nil if resp.status_code < 200 || resp.status_code >= 300
+
+          data = resp.json
+          data.is_a?(Hash) ? data : nil
+        rescue StandardError
+          nil
+        end
+      end
+
+      # 从列表条目提取邮件 ID（支持多字段）
+      def extract_id(row)
+        %w[id _id mail_id messageId message_id].each do |key|
+          v = row[key]
+          next if v.nil?
+
+          return v.to_s.strip if v.is_a?(String) && !v.strip.empty?
+          return v.to_i.to_s if v.is_a?(Numeric)
+        end
+        ""
+      end
+
       # 获取邮件列表
+      # 1. GET /api/fetch?to={email} 拉取列表元数据
+      # 2. 对每封邮件 GET /api/fetch/{id} 拉取详情（含完整 text/html）
+      # 3. 详情失败时保留列表字段作为回退
       # @param email [String]
       # @return [Array<Email>]
       def get_emails(email)
@@ -60,7 +94,14 @@ module TempmailSdk
         return [] unless data.is_a?(Array)
 
         data.select { |raw| raw.is_a?(Hash) }.map do |raw|
-          Normalize.normalize_email(raw, addr)
+          mail_id = extract_id(raw)
+          merged = raw.dup
+          # 无条件调用详情接口，用详情字段覆盖列表字段
+          unless mail_id.empty?
+            detail = fetch_detail(mail_id)
+            merged.merge!(detail) if detail
+          end
+          Normalize.normalize_email(merged, addr)
         end
       end
     end

data/lib/tempmail_sdk/providers/mail_td.rb

@@ -0,0 +1,161 @@
+# frozen_string_literal: true
+
+require "digest"
+require "json"
+
+module TempmailSdk
+  module Providers
+    # mail.td 渠道实现（基于 SHA-256 Proof-of-Work 的临时邮箱服务）
+    #
+    # 流程：
+    #   1. GET /api/domains 获取可用域名（过滤 pro_only）
+    #   2. 求解 PoW: SHA-256(address + timestamp + nonce) 需满足 difficulty 个前导零位
+    #   3. POST /api/accounts 携带 PoW 创建账户 → 返回 JWT + ID
+    #   4. GET /api/accounts/{id}/messages?page=1 携带 Bearer JWT 获取邮件
+    # token 格式: JSON {"jwt":"...","id":"..."}
+    module MailTd
+      CHANNEL = "mail-td"
+      API_BASE = "https://api.mail.td/api"
+      RAND_CHARS = ("a".."z").to_a + ("0".."9").to_a
+
+      HEADERS = {
+        "Accept" => "application/json",
+        "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " \
+                       "(KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36"
+      }.freeze
+
+      module_function
+
+      # 生成随机小写字母 + 数字字符串
+      def random_string(len)
+        Array.new(len) { RAND_CHARS.sample }.join
+      end
+
+      # 检查哈希是否满足 difficulty 个前导零位
+      def leading_zero_bits?(hash_bytes, difficulty)
+        full = difficulty / 8
+        remain = difficulty % 8
+        (0...full).each { |i| return false if hash_bytes.getbyte(i) != 0 }
+        if remain.positive? && full < hash_bytes.bytesize
+          mask = (0xFF << (8 - remain)) & 0xFF
+          return false if (hash_bytes.getbyte(full) & mask) != 0
+        end
+        true
+      end
+
+      # 求解 Proof-of-Work
+      # 目标：SHA-256(address + timestamp + nonce) 前导零位 >= difficulty
+      def solve_pow(address, timestamp, difficulty)
+        base = "#{address}#{timestamp}"
+        nonce = 0
+        while nonce < 100_000_000
+          hash = Digest::SHA256.digest("#{base}#{nonce}")
+          return nonce.to_s if leading_zero_bits?(hash, difficulty)
+
+          nonce += 1
+        end
+        raise "mail-td: PoW 求解超时"
+      end
+
+      # 获取可用域名列表（过滤 pro_only）
+      def fetch_domains
+        resp = Http.get("#{API_BASE}/domains", headers: HEADERS)
+        raise "mail-td: 域名请求 HTTP #{resp.status_code}" unless resp.ok?
+
+        data = resp.json
+        domains = data["domains"] || []
+        free = domains.select { |d| d["pro_only"] == false && !d["domain"].to_s.empty? }
+                      .map { |d| d["domain"] }
+        raise "mail-td: 无可用免费域名" if free.empty?
+
+        free
+      end
+
+      # 创建临时邮箱
+      # @return [EmailInfo]
+      def generate_email
+        domain = fetch_domains.sample
+        username = random_string(10)
+        address = "#{username}@#{domain}"
+        password = random_string(20)
+        auth_key = Digest::SHA256.hexdigest(password)
+
+        addr_lower = address.strip.downcase
+        difficulty = 15
+        pow_token = ""
+
+        4.times do
+          timestamp = Time.now.to_i
+          nonce = solve_pow(addr_lower, timestamp, difficulty)
+          pow_obj = { "t" => timestamp, "n" => nonce, "d" => difficulty }
+          pow_obj["token"] = pow_token unless pow_token.empty?
+
+          resp = Http.post("#{API_BASE}/accounts",
+                           headers: HEADERS.merge("Content-Type" => "application/json"),
+                           json: { "address" => address, "auth_key" => auth_key, "pow" => pow_obj })
+
+          result = begin
+            resp.json
+          rescue StandardError
+            {}
+          end
+
+          if result["status"] == "retry"
+            rd = result["required_difficulty"]
+            difficulty = rd.is_a?(Numeric) ? rd.to_i : difficulty + 2
+            pow_token = result["token"].to_s
+            next
+          end
+
+          raise "mail-td: 创建账户 HTTP #{resp.status_code}: #{result['error']}" unless resp.ok?
+
+          result_addr = result["address"].to_s
+          result_token = result["token"].to_s
+          result_id = result["id"].to_s
+          raise "mail-td: 响应缺少必要字段" if result_addr.empty? || result_token.empty? || result_id.empty?
+
+          tok = JSON.generate("jwt" => result_token, "id" => result_id)
+          return EmailInfo.new(channel: CHANNEL, email: result_addr, token: tok)
+        end
+
+        raise "mail-td: PoW 重试次数超限"
+      end
+
+      # 获取邮件列表
+      # @param token [String] JSON {"jwt":"...","id":"..."}
+      # @param email [String]
+      # @return [Array<Email>]
+      def get_emails(token, email)
+        raise "mail-td: token 为空" if token.to_s.empty?
+
+        parsed = JSON.parse(token)
+        jwt = parsed["jwt"].to_s
+        id = parsed["id"].to_s
+        raise "mail-td: token 缺少 jwt 或 id" if jwt.empty? || id.empty?
+
+        resp = Http.get("#{API_BASE}/accounts/#{id}/messages?page=1",
+                        headers: HEADERS.merge("Authorization" => "Bearer #{jwt}"))
+        raise "mail-td: 邮件请求 HTTP #{resp.status_code}" unless resp.ok?
+
+        data = resp.json
+        messages = data["messages"]
+        return [] unless messages.is_a?(Array) && !messages.empty?
+
+        messages.map do |msg|
+          from_addr = msg.dig("from", "address").to_s
+          Normalize.normalize_email({
+            "id" => msg["id"].to_s,
+            "from" => from_addr,
+            "to" => email,
+            "subject" => msg["subject"].to_s,
+            "text" => msg["text"].to_s,
+            "html" => msg["html"].to_s,
+            "created_at" => msg["created_at"].to_s
+          }, email)
+        end
+      rescue JSON::ParserError
+        raise "mail-td: token 格式无效"
+      end
+    end
+  end
+end

data/lib/tempmail_sdk/providers/mailcat_ai.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module TempmailSdk
+  module Providers
+    # mailcat.ai 渠道实现
+    #
+    # 流程：POST /mailboxes 创建邮箱（无 body），返回 email + token
+    #       GET /inbox 获取邮件列表，需要 Authorization: Bearer {token}
+    module MailcatAi
+      CHANNEL = "mailcat-ai"
+      BASE_URL = "https://api.mailcat.ai"
+
+      HEADERS = {
+        "Accept" => "application/json",
+        "User-Agent" => "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " \
+                        "(KHTML, like Gecko) Chrome/146.0.0.0 Safari/537.36 Edg/146.0.0.0"
+      }.freeze
+
+      module_function
+
+      # 创建 mailcat.ai 临时邮箱
+      # @return [EmailInfo]
+      def generate_email
+        resp = Http.post("#{BASE_URL}/mailboxes", headers: HEADERS, timeout: 15)
+        resp.raise_for_status
+        data = resp.json
+        email = data.dig("data", "email").to_s.strip
+        token = data.dig("data", "token").to_s.strip
+        raise "mailcat-ai: 响应缺少 email 或 token" if email.empty? || token.empty?
+
+        EmailInfo.new(channel: CHANNEL, email: email, token: token)
+      end
+
+      # 获取 mailcat.ai 邮件列表
+      # @param token [String] Bearer token
+      # @param email [String] 邮箱地址
+      # @return [Array<Email>]
+      def get_emails(token, email)
+        hdrs = HEADERS.merge("Authorization" => "Bearer #{token.to_s.strip}")
+        resp = Http.get("#{BASE_URL}/inbox", headers: hdrs, timeout: 15)
+        resp.raise_for_status
+        data = resp.json
+        items = data.is_a?(Hash) ? Array(data["data"]) : []
+        items.filter_map do |raw|
+          next unless raw.is_a?(Hash)
+
+          Normalize.normalize_email(raw.merge("to" => email), email)
+        end
+      end
+    end
+  end
+end

data/lib/tempmail_sdk/providers/maildrop.rb

@@ -62,6 +62,55 @@ module TempmailSdk
         EmailInfo.new(channel: CHANNEL, email: email, token: email)
       end
 
+      # 通过详情接口获取单封邮件完整内容
+      # GET /api/email_content.php?id={id}
+      # 详情响应字段（从前端代码确认）:
+      #   content: 完整 HTML 正文
+      #   subject / from_addr / date: 邮件元数据
+      #   attachment: JSON 字符串数组 [{filename, path, size}]
+      def fetch_detail(id)
+        mid = id.to_s.strip
+        return nil if mid.empty?
+
+        begin
+          resp = Http.get("#{BASE}/api/email_content.php?id=#{URI.encode_www_form_component(mid)}",
+                          headers: HEADERS, timeout: 15)
+          return nil if resp.status_code < 200 || resp.status_code >= 300
+
+          data = resp.body.empty? ? nil : resp.json
+          data.is_a?(Hash) ? data : nil
+        rescue StandardError
+          nil
+        end
+      end
+
+      # 解析详情接口的 attachment 字段（JSON 字符串）为附件数组
+      def parse_attachments(raw)
+        return [] if raw.nil? || !raw.is_a?(String) || raw.strip.empty?
+
+        begin
+          items = JSON.parse(raw)
+        rescue JSON::ParserError
+          return []
+        end
+        return [] unless items.is_a?(Array)
+
+        items.filter_map do |it|
+          next unless it.is_a?(Hash)
+
+          filename = (it["filename"] || "").to_s.strip
+          next if filename.empty?
+
+          entry = { "filename" => filename }
+          entry["size"] = it["size"].to_i if it["size"].is_a?(Numeric)
+          entry
+        end
+      end
+
+      # 获取邮件列表并对每封邮件补拉详情
+      # 1. GET /api/emails.php 拉取列表（仅含 description 摘要）
+      # 2. 对每封邮件 GET /api/email_content.php?id={id} 拉取详情（含 content 完整 HTML）
+      # 3. 详情失败时保留列表 description 作为回退
       # @param email [String]
       # @param token [String, nil]
       # @return [Array<Email>]
@@ -78,12 +127,38 @@ module TempmailSdk
         return [] unless rows.is_a?(Array)
 
         rows.select { |row| row.is_a?(Hash) }.map do |row|
+          mail_id = row["id"].to_s
+          desc = (row["description"] || "").strip
           ir = row["isRead"]
+          is_read = ir == true || ir == 1
+
+          from = (row["from_addr"] || "").strip
+          subject = (row["subject"] || "").strip
+          date = cx_date_to_iso(row["date"] || "")
+          html = ""
+          attachments = []
+
+          # 拉取详情覆盖 html/from/subject/date/attachments
+          unless mail_id.empty?
+            detail = fetch_detail(mail_id)
+            if detail
+              d_content = detail["content"]
+              html = d_content if d_content.is_a?(String) && !d_content.strip.empty?
+              d_from = detail["from_addr"]
+              from = d_from.strip if d_from.is_a?(String) && !d_from.strip.empty?
+              d_subj = detail["subject"]
+              subject = d_subj.strip if d_subj.is_a?(String) && !d_subj.strip.empty?
+              d_date = detail["date"]
+              date = cx_date_to_iso(d_date) if d_date.is_a?(String) && !d_date.strip.empty?
+              attachments = parse_attachments(detail["attachment"])
+            end
+          end
+
           Email.new(
-            id: row["id"].to_s, from_addr: (row["from_addr"] || "").strip, to: addr,
-            subject: (row["subject"] || "").strip, text: (row["description"] || "").strip,
-            html: "", date: cx_date_to_iso(row["date"] || ""),
-            is_read: ir == true || ir == 1, attachments: []
+            id: mail_id, from_addr: from, to: addr,
+            subject: subject, text: desc,
+            html: html, date: date,
+            is_read: is_read, attachments: attachments
           )
         end
       end