        (gnus-group-news-low ((t (:foreground ,violet :bold t))))
        (gnus-group-news-low-empty ((t (:foreground ,violet))))
        (gnus-header-content ((t (:foreground ,cyan :italic t))))
-       (gnus-header-from ((t (:foreground ,base1))))
+       (gnus-header-from ((t (:foreground ,base2))))
        (gnus-header-name ((t (:foreground ,blue))))
        (gnus-header-newsgroups ((t (:foreground ,green :italic t))))
-       (gnus-header-subject ((t (:foreground ,base0))))
+       (gnus-header-subject ((t (:foreground ,base1))))
        (gnus-server-agent ((t (:foreground ,base3 :bold t))))
        (gnus-server-closed ((t (:foreground ,base1 :italic t))))
        (gnus-server-denied ((t (:foreground ,base2 :bold t))))
        (gnus-server-offline ((t (:foreground ,green :bold t))))
        (gnus-server-opened ((t (:foreground ,cyan :bold t))))
        (gnus-splash ((t (:foreground ,base2))))
-       (gnus-summary-high-ancient ((t (:foreground ,base1 :bold t))))
-       (gnus-summary-high-read ((t (:foreground ,base0 :bold t))))
+       (gnus-summary-high-ancient ((t (:foreground ,magenta :bold t))))
+       (gnus-summary-high-read ((t (:foreground ,base1 :bold t))))
        (gnus-summary-high-ticked ((t (:foreground ,base3 :bold t))))
        (gnus-summary-high-undownloaded ((t (:foreground ,base2 :bold t))))
-       (gnus-summary-low-ancient ((t (:foreground ,base1 :italic t))))
-       (gnus-summary-low-read ((t (:foreground ,base0 :italic t))))
+       (gnus-summary-low-ancient ((t (:foreground ,magenta :italic t))))
+       (gnus-summary-low-read ((t (:foreground ,base1 :italic t))))
        (gnus-summary-low-ticked ((t (:foreground ,base3 :italic t))))
        (gnus-summary-low-undownloaded ((t (:foreground ,base2 :italic t))))
-       (gnus-summary-normal-ancient ((t (:foreground ,base1))))
-       (gnus-summary-normal-read ((t (:foreground ,base0))))
+       (gnus-summary-normal-ancient ((t (:foreground ,magenta))))
+       (gnus-summary-normal-read ((t (:foreground ,base1))))
        (gnus-summary-normal-ticked ((t (:foreground ,base3))))
-       (gnus-summary-normal-undownloaded ((t (:foreground ,base2))))))))
+       (gnus-summary-normal-undownloaded ((t (:foreground ,base2))))
+       ;; Message
+       (message-mml ((t (:foreground ,blue))))
+       (message-cited-text ((t (:foreground ,base2))))
+       (message-separator ((t (:foreground ,base3))))
+       (message-header-xheader ((t (:foreground ,violet))))
+       (message-header-name ((t (:foreground ,cyan))))
+       (message-header-other ((t (:foreground ,red))))
+       (message-header-newsgroups ((t (:foreground ,yellow :bold t :italic t))))
+       (message-header-subject ((t (:foreground ,base00))))
+       (message-header-cc ((t (:foreground ,green :bold t))))
+       (message-header-to ((t (:foreground ,base1 :bold t))))))))
 
 (defun color-theme-solarized-dark ()
   (interactive)

       (gnus-group-mail-2-empty ((t (:foreground ,base2))))
       (gnus-group-mail-3 ((t (:foreground ,magenta :bold t))))
       (gnus-group-mail-3-empty ((t (:foreground ,magenta))))
       (gnus-group-mail-low ((t (:foreground ,base0 :bold t))))
       (gnus-group-mail-low-empty ((t (:foreground ,base0))))
       (gnus-group-news-1 ((t (:foreground ,base1 :bold t))))
       (gnus-group-news-1-empty ((t (:foreground ,base1))))
       (gnus-group-news-2 ((t (:foreground ,blue :bold t))))

       ;; comint
       (comint-highlight-prompt ((t (:foreground ,blue))))
       ;; gnus
       (gnus-cite-1 ((t (:foreground ,magenta))))
       (gnus-cite-2 ((t (:foreground ,base2))))
       (gnus-cite-3 ((t (:foreground ,base3))))
       (gnus-cite-4 ((t (:foreground ,base1))))
       (gnus-cite-5 ((t (:foreground ,magenta))))
       (gnus-cite-6 ((t (:foreground ,base2))))
       (gnus-cite-7 ((t (:foreground ,base3))))
       (gnus-cite-8 ((t (:foreground ,base1))))
       (gnus-cite-9 ((t (:foreground ,base2))))
       (gnus-cite-10 ((t (:foreground ,base3))))
       (gnus-cite-11 ((t (:foreground ,blue))))
