2007-03-07 [wwp] 2.8.1cvs3

[claws.git] / src / quote_fmt_parse.y

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index b9829c9f8a5096c96eee91ef0e7e61c950b0fbac..42e92ab42558af56cf5e7743805cf088f55a2bb2 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -490,7 +490,7 @@ static void quote_fmt_insert_user_input(const gchar *varname)
 %token SHOW_DATE SHOW_FROM SHOW_FULLNAME SHOW_FIRST_NAME SHOW_LAST_NAME
 %token SHOW_SENDER_INITIAL SHOW_SUBJECT SHOW_TO SHOW_MESSAGEID
 %token SHOW_PERCENT SHOW_CC SHOW_REFERENCES SHOW_MESSAGE
-%token SHOW_QUOTED_MESSAGE SHOW_BACKSLASH SHOW_TAB
+%token SHOW_QUOTED_MESSAGE SHOW_BACKSLASH SHOW_TAB SHOW_MAIL_ADDRESS
 %token SHOW_QUOTED_MESSAGE_NO_SIGNATURE SHOW_MESSAGE_NO_SIGNATURE
 %token SHOW_EOL SHOW_QUESTION_MARK SHOW_EXCLAMATION_MARK SHOW_PIPE SHOW_OPARENT SHOW_CPARENT
 %token SHOW_ACCOUNT_FULL_NAME SHOW_ACCOUNT_MAIL_ADDRESS SHOW_ACCOUNT_NAME SHOW_ACCOUNT_ORGANIZATION
@@ -589,6 +589,15 @@ special:
                if (msginfo->from)
                        INSERT(msginfo->from);
        }
+       | SHOW_MAIL_ADDRESS
+       {
+               if (msginfo->from) {
+                       gchar *stripped_address = g_strdup(msginfo->from);
+                       extract_address(stripped_address);
+                       INSERT(stripped_address);
+                       g_free(stripped_address);
+               }
+       }
        | SHOW_FULLNAME
        {
                if (msginfo->fromname)