diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5386ac4e2..5b3865e19 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -117,6 +117,7 @@
- Models: extend `clawdbot models` status output with a masked auth overview (profiles, env sources, and OAuth counts).
### Maintenance
+- Skills: add Himalaya email CLI skill. Thanks @dantelex for PR #335.
- Agent: add `skipBootstrap` config option. Thanks @onutc for PR #292.
- UI: add favicon.ico derived from the macOS app icon. Thanks @jeffersonwarrior for PR #305.
- Tooling: replace tsx with bun for TypeScript execution. Thanks @obviyus for PR #278.
diff --git a/README.md b/README.md
index 23d1827b9..b32dbac49 100644
--- a/README.md
+++ b/README.md
@@ -453,5 +453,5 @@ Thanks to all clawtributors:
- 
+ 
diff --git a/skills/himalaya/SKILL.md b/skills/himalaya/SKILL.md
index 4dfc68ab4..5823e31b1 100644
--- a/skills/himalaya/SKILL.md
+++ b/skills/himalaya/SKILL.md
@@ -79,7 +79,7 @@ himalaya envelope list --page 1 --page-size 20
### Search Emails
```bash
-himalaya envelope list --query "from:john@example.com subject:meeting"
+himalaya envelope list --query "from john@example.com subject meeting"
```
### Read an Email
@@ -89,9 +89,9 @@ Read email by ID (shows plain text):
himalaya message read 42
```
-Read as raw MIME:
+Export raw MIME:
```bash
-himalaya message read 42 --raw
+himalaya message export 42 --full
```
### Reply to an Email
@@ -222,4 +222,3 @@ RUST_LOG=trace RUST_BACKTRACE=1 himalaya envelope list
- Message IDs are relative to the current folder; re-list after folder changes.
- For composing rich emails with attachments, use MML syntax (see `references/message-composition.md`).
- Store passwords securely using `pass`, system keyring, or a command that outputs the password.
-
diff --git a/skills/himalaya/references/configuration.md b/skills/himalaya/references/configuration.md
index 42c252628..015049203 100644
--- a/skills/himalaya/references/configuration.md
+++ b/skills/himalaya/references/configuration.md
@@ -39,14 +39,14 @@ backend.auth.raw = "your-password"
### Password from command (recommended)
```toml
backend.auth.cmd = "pass show email/imap"
-backend.auth.cmd = "security find-generic-password -a user@example.com -s imap -w"
+# backend.auth.cmd = "security find-generic-password -a user@example.com -s imap -w"
```
### System keyring (requires keyring feature)
```toml
backend.auth.keyring = "imap-example"
```
-Then run `himalaya configure -a ` to store the password.
+Then run `himalaya account configure ` to store the password.
## Gmail Configuration
@@ -172,4 +172,3 @@ Set via environment variable:
```bash
export EDITOR="vim"
```
-
diff --git a/skills/himalaya/references/message-composition.md b/skills/himalaya/references/message-composition.md
index 9e22c1eec..17e40ef37 100644
--- a/skills/himalaya/references/message-composition.md
+++ b/skills/himalaya/references/message-composition.md
@@ -163,14 +163,15 @@ himalaya message forward 42
### Send from stdin
```bash
-cat message.txt | himalaya message write
+cat message.txt | himalaya template send
```
-### Send with headers from CLI
+### Prefill headers from CLI
```bash
-echo "Message body here" | himalaya message write \
- --to "recipient@example.com" \
- --subject "Quick Message"
+himalaya message write \
+ -H "To:recipient@example.com" \
+ -H "Subject:Quick Message" \
+ "Message body here"
```
## Tips
@@ -178,5 +179,4 @@ echo "Message body here" | himalaya message write \
- The editor opens with a template; fill in headers and body.
- Save and exit the editor to send; exit without saving to cancel.
- MML parts are compiled to proper MIME when sending.
-- Use `--raw` with `message read` to see the raw MIME structure of received emails.
-
+- Use `himalaya message export --full` to inspect the raw MIME structure of received emails.