X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=mutt.h;h=e4e192d9c2e7c4a6ace9dbb5d4191ef4b7dde3d6;hp=10e6c0c102917f7f762be6779f3edd5475666b6d;hb=c88f8ebd5e7542e4ee2ac2c24dfd5f358dbb4235;hpb=c8bf978fc5c4f6c793620a515fa2456a3fa9eb13

diff --git a/mutt.h b/mutt.h
index 10e6c0c..e4e192d 100644
--- a/mutt.h
+++ b/mutt.h
@@ -45,7 +45,8 @@
 #include <lib-lib/hash.h>
 #include <lib-lib/list.h>
 
-#include "rfc822.h"
+#include <lib-mime/mime.h>
+
 #include "charset.h"
 #include "lib/rx.h"
 
@@ -535,14 +536,14 @@ int mutt_matches_ignore (const char *, LIST *);
 void mutt_init (int, LIST *);
 
 typedef struct envelope {
-  ADDRESS *return_path;
-  ADDRESS *from;
-  ADDRESS *to;
-  ADDRESS *cc;
-  ADDRESS *bcc;
-  ADDRESS *sender;
-  ADDRESS *reply_to;
-  ADDRESS *mail_followup_to;
+  address_t *return_path;
+  address_t *from;
+  address_t *to;
+  address_t *cc;
+  address_t *bcc;
+  address_t *sender;
+  address_t *reply_to;
+  address_t *mail_followup_to;
   char *list_post;              /* this stores a mailto URL, or nothing */
   char *subject;
   char *real_subj;              /* offset of the real subject */
@@ -565,12 +566,6 @@ typedef struct envelope {
   unsigned int refs_changed:1;  /* References changed to break thread */
 } ENVELOPE;
 
-typedef struct parameter {
-  char *attribute;
-  char *value;
-  struct parameter *next;
-} PARAMETER;
-
 /* Information that helps in determing the Content-* of an attachment */
 typedef struct content {
   long hibin;                   /* 8-bit characters */