diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index 210830a2b496..1ecac5625718 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1501,7 +1501,8 @@ add things to `%s' instead."
                                   (erc-query-buffer-p buffer)
                                   erc-format-query-as-channel-p))
                         privp)
-                   msgp))))
+                   msgp
+                   (string-match-p "twitter" (buffer-name buffer))))))
         (when s
           (if (and noticep privp)
               (progn
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index d1fa5c7f1207..0bfe57a4ad39 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4284,10 +4284,10 @@ and as second argument the event parsed as a vector."
   (and (erc-is-message-ctcp-p message)
        (not (string-match "^\C-aACTION.*\C-a$" message))))
 
-(defun erc-format-privmessage (nick msg privp msgp)
+(defun erc-format-privmessage (nick msg privp msgp &optional twitterp)
   "Format a PRIVMSG in an insertable fashion."
-  (let* ((mark-s (if msgp (if privp "*" "<") "-"))
-         (mark-e (if msgp (if privp "*" ">") "-"))
+  (let* ((mark-s (if msgp (if privp "*" (if twitterp "" "<")) "-"))
+	 (mark-e (if msgp (if privp "*" (if twitterp ":" ">")) "-"))
          (str    (format "%s%s%s %s" mark-s nick mark-e msg))
          (nick-face (if privp 'erc-nick-msg-face 'erc-nick-default-face))
          (msg-face (if privp 'erc-direct-msg-face 'erc-default-face)))