From 4c7fd88d57cde39b8f967b86756f0e93e7d42dd3 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Fri, 30 Jul 2021 15:32:37 +0200
Subject: [PATCH] protonmail: mark more Message fields as json omitempty

Setting an empty ExternalID results in an e-mail with:

    Message-Id: <>
---
 protonmail/messages.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/protonmail/messages.go b/protonmail/messages.go
index 0200cab..89d42ae 100644
--- a/protonmail/messages.go
+++ b/protonmail/messages.go
@@ -54,9 +54,9 @@ type MessageAddress struct {
 }
 
 type Message struct {
-	ID             string
+	ID             string `json:",omitempty"`
 	Order          int64
-	ConversationID string
+	ConversationID string `json:",omitempty"`
 	Subject        string
 	Unread         int
 	Type           MessageType
@@ -77,10 +77,10 @@ type Message struct {
 	CCList         []*MessageAddress
 	BCCList        []*MessageAddress
 	ReplyTos       []*MessageAddress
-	Header         string
+	Header         string `json:",omitempty"`
 	Attachments    []*Attachment
 	LabelIDs       []string
-	ExternalID     string
+	ExternalID     string `json:",omitempty"`
 }
 
 func (msg *Message) Read(keyring openpgp.KeyRing, prompt openpgp.PromptFunction) (*openpgp.MessageDetails, error) {