googleworkspace · malob · Mar 18, 2026 · Mar 18, 2026
diff --git a/.changeset/gmail-draft-flag.md b/.changeset/gmail-draft-flag.md
@@ -0,0 +1,5 @@
+---
+"@googleworkspace/cli": minor
+---
+
+Add `--draft` flag to Gmail `+send`, `+reply`, `+reply-all`, and `+forward` helpers to save messages as drafts instead of sending them immediately
diff --git a/.changeset/original-attachments-and-inline-images.md b/.changeset/original-attachments-and-inline-images.md
@@ -0,0 +1,10 @@
+---
+"@googleworkspace/cli": minor
+---
+
+Forward original attachments by default and preserve inline images in HTML mode.
+
+`+forward` now includes the original message's attachments and inline images by default,
+matching Gmail web behavior. Use `--no-original-attachments` to opt out.
+`+reply`/`+reply-all` with `--html` preserve inline images in the quoted body via
+`multipart/related`. In plain-text mode, inline images are not included (matching Gmail web).
diff --git a/skills/gws-gmail-forward/SKILL.md b/skills/gws-gmail-forward/SKILL.md
@@ -30,11 +30,13 @@ gws gmail +forward --message-id <ID> --to <EMAILS>
 | `--to` | ✓ | — | Recipient email address(es), comma-separated |
 | `--from` | — | — | Sender address (for send-as/alias; omit to use account default) |
 | `--body` | — | — | Optional note to include above the forwarded message (plain text, or HTML with --html) |
+| `--no-original-attachments` | — | — | Do not include file attachments from the original message (inline images in --html mode are preserved) |
 | `--attach` | — | — | Attach a file (can be specified multiple times) |
 | `--cc` | — | — | CC email address(es), comma-separated |
 | `--bcc` | — | — | BCC email address(es), comma-separated |
 | `--html` | — | — | Treat --body as HTML content (default is plain text) |
 | `--dry-run` | — | — | Show the request that would be sent without executing it |
+| `--draft` | — | — | Save as draft instead of sending |
 
 ## Examples
 
@@ -44,14 +46,21 @@ gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com --body 'FYI se
 gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com --cc eve@example.com
 gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com --body '<p>FYI</p>' --html
 gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com -a notes.pdf
+gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com --no-original-attachments
+gws gmail +forward --message-id 18f1a2b3c4d --to dave@example.com --draft
 ```
 
 ## Tips
 
 - Includes the original message with sender, date, subject, and recipients.
-- Use -a/--attach to add file attachments. Can be specified multiple times.
+- Original attachments are included by default (matching Gmail web behavior).
+- With --html, inline images are also preserved via cid: references.
+- In plain-text mode, inline images are not included (matching Gmail web).
+- Use --no-original-attachments to forward without the original message's files.
+- Use -a/--attach to add extra file attachments. Can be specified multiple times.
+- Combined size of original and user attachments is limited to 25MB.
 - With --html, the forwarded block uses Gmail's gmail_quote CSS classes and preserves HTML formatting. Use fragment tags (<p>, <b>, <a>, etc.) — no <html>/<body> wrapper needed.
-- With --html, inline images in the forwarded message (cid: references) will appear broken. Externally hosted images are unaffected.
+- Use --draft to save the forward as a draft instead of sending it immediately.
 
 ## See Also
 

diff --git a/skills/gws-gmail-reply-all/SKILL.md b/skills/gws-gmail-reply-all/SKILL.md
@@ -35,6 +35,7 @@ gws gmail +reply-all --message-id <ID> --body <TEXT>
 | `--bcc` | — | — | BCC email address(es), comma-separated |
 | `--html` | — | — | Treat --body as HTML content (default is plain text) |
 | `--dry-run` | — | — | Show the request that would be sent without executing it |
+| `--draft` | — | — | Save as draft instead of sending |
 | `--remove` | — | — | Exclude recipients from the outgoing reply (comma-separated emails) |
 
 ## Examples
@@ -45,6 +46,7 @@ gws gmail +reply-all --message-id 18f1a2b3c4d --body 'Updated' --remove bob@exam
 gws gmail +reply-all --message-id 18f1a2b3c4d --body 'Adding Eve' --cc eve@example.com
 gws gmail +reply-all --message-id 18f1a2b3c4d --body '<i>Noted</i>' --html
 gws gmail +reply-all --message-id 18f1a2b3c4d --body 'Notes attached' -a notes.pdf
+gws gmail +reply-all --message-id 18f1a2b3c4d --body 'Draft reply' --draft
 ```
 
 ## Tips
@@ -57,7 +59,8 @@ gws gmail +reply-all --message-id 18f1a2b3c4d --body 'Notes attached' -a notes.p
 - The command fails if no To recipient remains after exclusions and --to additions.
 - Use -a/--attach to add file attachments. Can be specified multiple times.
 - With --html, the quoted block uses Gmail's gmail_quote CSS classes and preserves HTML formatting. Use fragment tags (<p>, <b>, <a>, etc.) — no <html>/<body> wrapper needed.
-- With --html, inline images in the quoted message (cid: references) will appear broken. Externally hosted images are unaffected.
+- With --html, inline images in the quoted message are preserved via cid: references.
+- Use --draft to save the reply as a draft instead of sending it immediately.
 
 ## See Also
 

diff --git a/skills/gws-gmail-reply/SKILL.md b/skills/gws-gmail-reply/SKILL.md
@@ -35,6 +35,7 @@ gws gmail +reply --message-id <ID> --body <TEXT>
 | `--bcc` | — | — | BCC email address(es), comma-separated |
 | `--html` | — | — | Treat --body as HTML content (default is plain text) |
 | `--dry-run` | — | — | Show the request that would be sent without executing it |
+| `--draft` | — | — | Save as draft instead of sending |
 
 ## Examples
 
@@ -44,6 +45,7 @@ gws gmail +reply --message-id 18f1a2b3c4d --body 'Looping in Carol' --cc carol@e
 gws gmail +reply --message-id 18f1a2b3c4d --body 'Adding Dave' --to dave@example.com
 gws gmail +reply --message-id 18f1a2b3c4d --body '<b>Bold reply</b>' --html
 gws gmail +reply --message-id 18f1a2b3c4d --body 'Updated version' -a updated.docx
+gws gmail +reply --message-id 18f1a2b3c4d --body 'Draft reply' --draft
 ```
 
 ## Tips
@@ -53,7 +55,8 @@ gws gmail +reply --message-id 18f1a2b3c4d --body 'Updated version' -a updated.do
 - --to adds extra recipients to the To field.
 - Use -a/--attach to add file attachments. Can be specified multiple times.
 - With --html, the quoted block uses Gmail's gmail_quote CSS classes and preserves HTML formatting. Use fragment tags (<p>, <b>, <a>, etc.) — no <html>/<body> wrapper needed.
-- With --html, inline images in the quoted message (cid: references) will appear broken. Externally hosted images are unaffected.
+- With --html, inline images in the quoted message are preserved via cid: references.
+- Use --draft to save the reply as a draft instead of sending it immediately.
 - For reply-all, use +reply-all instead.
 
 ## See Also

diff --git a/skills/gws-gmail-send/SKILL.md b/skills/gws-gmail-send/SKILL.md
@@ -35,6 +35,7 @@ gws gmail +send --to <EMAILS> --subject <SUBJECT> --body <TEXT>
 | `--bcc` | — | — | BCC email address(es), comma-separated |
 | `--html` | — | — | Treat --body as HTML content (default is plain text) |
 | `--dry-run` | — | — | Show the request that would be sent without executing it |
+| `--draft` | — | — | Save as draft instead of sending |
 
 ## Examples
 
@@ -45,6 +46,7 @@ gws gmail +send --to alice@example.com --subject 'Hello' --body '<b>Bold</b> tex
 gws gmail +send --to alice@example.com --subject 'Hello' --body 'Hi!' --from alias@example.com
 gws gmail +send --to alice@example.com --subject 'Report' --body 'See attached' -a report.pdf
 gws gmail +send --to alice@example.com --subject 'Files' --body 'Two files' -a a.pdf -a b.csv
+gws gmail +send --to alice@example.com --subject 'Hello' --body 'Hi!' --draft
 ```
 
 ## Tips
@@ -53,6 +55,7 @@ gws gmail +send --to alice@example.com --subject 'Files' --body 'Two files' -a a
 - Use --from to send from a configured send-as alias instead of your primary address.
 - Use -a/--attach to add file attachments. Can be specified multiple times. Total size limit: 25MB.
 - With --html, use fragment tags (<p>, <b>, <a>, <br>, etc.) — no <html>/<body> wrapper needed.
+- Use --draft to save the message as a draft instead of sending it immediately.
 
 > [!CAUTION]
 > This is a **write** command — confirm with the user before executing.