--- mailutils-1.0.orig/comsat/action.c	2005-08-29 03:21:54.000000000 -0700
+++ mailutils-1.0/comsat/action.c	2006-08-25 15:14:14.000000000 -0700
@@ -345,23 +345,33 @@
 
       while (act_getline (fp, &stmt, &size))
 	{
-	  char *str;
 	  int argc;
 	  char **argv;
+          int c;
 
 	  line++;
-	  str = expand_line (stmt, msg);
-	  if (!str)
-	    continue;
-	  if (mu_argcv_get (str, "", NULL, &argc, &argv)
+	  if (mu_argcv_get (stmt, "", NULL, &argc, &argv)
 	      || argc == 0
 	      || argv[0][0] == '#')
 	    {
-	      free (str);
 	      mu_argcv_free (argc, argv);
 	      continue;
 	    }
 
+          for(c=1; c<argc; c++)
+            {
+              char *oldarg = argv[c];
+              argv[c] = expand_line (argv[c], msg);
+              free(oldarg);
+              if (!argv[c])
+                break;
+            }
+          if (c < argc) /* loop did not complete due to failed expand_line */
+            {
+              mu_argcv_free (argc, argv);
+              continue;
+            }
+
 	  if (strcmp (argv[0], "beep") == 0)
 	    {
 	      action_beep (tty);
@@ -383,8 +393,10 @@
 	      fprintf (tty, "\r\n");
 	      syslog (LOG_ERR, _("%s:.biffrc:%d: unknown keyword %s"),
 		      username, line, argv[0]);
+              mu_argcv_free (argc, argv);
 	      break;
 	    }
+          mu_argcv_free (argc, argv);
 	}
       fclose (fp);
     }