Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions mcp_email_server/emails/classic.py
Original file line number Diff line number Diff line change
Expand Up @@ -343,13 +343,24 @@ async def _batch_fetch_headers(
for i, item in enumerate(data):
if not isinstance(item, bytes) or b"BODY[HEADER]" not in item:
continue
# First try to find UID in the same line (standard format)
uid_match = re.search(rb"UID (\d+)", item)
if uid_match and i + 1 < len(data) and isinstance(data[i + 1], bytearray):
uid = uid_match.group(1).decode()
raw_headers = bytes(data[i + 1])
metadata = self._parse_headers(uid, raw_headers)
if metadata:
results[uid] = metadata
# Proton Bridge format: UID comes AFTER header data in a separate item
# Format: [i]=b'N FETCH (BODY[HEADER] {size}', [i+1]=bytearray(headers), [i+2]=b' UID xxx)'
elif i + 2 < len(data) and isinstance(data[i + 1], bytearray):
uid_after_match = re.search(rb"UID (\d+)", data[i + 2]) if isinstance(data[i + 2], bytes) else None
if uid_after_match:
uid = uid_after_match.group(1).decode()
raw_headers = bytes(data[i + 1])
metadata = self._parse_headers(uid, raw_headers)
if metadata:
results[uid] = metadata

return results

Expand Down
Loading