 
 (custom-set-faces
  '(circe-prompt-face ((t (:inherit 'font-lock-variable-name-face :weight bold))))
- '(circe-my-message-face ((t (:inherit 'font-lock-builtin-face)))))
+ '(circe-my-message-face ((t (:inherit 'font-lock-builtin-face))))
+ '(circe-originator-face ((t (:inherit 'font-lock-keyword-face)))))
 
 (setq circe-network-options
   `(("freenode"

    ("bitlbee"
     :host "bitlbee.pmade.com" :port 6697 :use-tls t
     :user "pjones/bitlbee"    :nick "pjones"
     :pass ,pjones-irc-password)))

;; Ignore KEEPALIVE requests: (not sure where these come from)
(circe-set-display-handler "irc.ctcp.KEEPALIVE" 'circe-display-ignore)

        right-margin-width 5
        truncate-lines nil
        word-wrap t
        wrap-prefix "  ")

  ;; Simple mode-line for Circe buffers:
  (setq mode-line-format
