diff --git a/changelog b/changelog
index 0a883d0..72423f4 100644
--- a/changelog
+++ b/changelog
@@ -35,6 +35,8 @@ export (QQ's a zone into a tarball)
 Xlist (mlist, olist, rlist, zlist, slist, tlist, qlist)
 (lots of major bugfixes too)
 @
+[Dec 06 2010] - Jamdog
+  Added new mail system, with inbox OLC, index rebuilder and first mail (to ID 1)
 [Dec 05 2010] - Jamdog
   Bug-Fix: 'Did you mean' now only shows commands you have access to (thanks Welcor)
   Bug-Fix: Fixed crash bug introduced by new house system when saving house contents
diff --git a/lib/mudmail/0/0.ml b/lib/mudmail/0/0.ml
new file mode 100644
index 0000000..9fb52a6
--- /dev/null
+++ b/lib/mudmail/0/0.ml
@@ -0,0 +1,20 @@
+MlID: 0
+Send: -1
+Reci: 1
+Sent: 1283977700
+Subj: Welcome to Trigun Mail
+Body:
+@GWelcome to Trigun MUD Mail System
+@W---------------------------------
+@y
+This is an automatic mail sent to the MUD owner. This new tbaMUD 
+Mail system allows for much greater flexibility than the old circle 
+MUDmail.
+
+A manual on usage is available at:
+@Chttp://www.stefancole.com/mudmail.pdf@n
+~
+Gold: 10
+Flag: f 0 0 0
+$~
+
diff --git a/lib/mudmail/index b/lib/mudmail/index
new file mode 100644
index 0000000..a7ff645
--- /dev/null
+++ b/lib/mudmail/index
@@ -0,0 +1,5 @@
+# tbaMUD Mail Index
+# Format: <ID> <flags> <sender ID/vnum> <recipient ID> <time> <subject>
+# For 'No Subject', use (null)
+0 f -1 4 1283977700  Welcome to tbaMUD Mail
+~
diff --git a/src/act.h b/src/act.h
index 5444f4d..12d89e7 100644
--- a/src/act.h
+++ b/src/act.h
@@ -51,12 +51,21 @@ ACMD(do_write);
  * Begin Functions and defines for act.informative.c
  ****************************************************************************/
 /* Utility Functions */
+/* do_look, do_inventory utility functions */
+void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode);
+void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show);
 /** @todo Move to a utility library */
 char *find_exdesc(char *word, struct extra_descr_data *list);
 /** @todo Move to a mud centric string utility library */
 void space_to_minus(char *str);
 /** @todo Move to a help module? */
 int search_help(const char *argument, int level);
+
+/* Used by show_obj_to_char */
+#define SHOW_OBJ_LONG     0
+#define SHOW_OBJ_SHORT    1
+#define SHOW_OBJ_ACTION   2
+
 /* functions with subcommands */
 /* do_commands */
 ACMD(do_commands);
diff --git a/src/act.informative.c b/src/act.informative.c
index 15fc6e9..d3ae238 100644
--- a/src/act.informative.c
+++ b/src/act.informative.c
@@ -38,23 +38,14 @@ static void look_at_char(struct char_data *i, struct char_data *ch);
 static void look_at_target(struct char_data *ch, char *arg);
 static void look_in_direction(struct char_data *ch, int dir);
 static void look_in_obj(struct char_data *ch, char *arg);
-/* do_look, do_inventory utility functions */
-static void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show);
 /* do_look, do_equipment, do_examine, do_inventory */
-static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode);
 static void show_obj_modifiers(struct obj_data *obj, struct char_data *ch);
 /* do_where utility functions */
 static void perform_immort_where(struct char_data *ch, char *arg);
 static void perform_mortal_where(struct char_data *ch, char *arg);
 static void print_object_location(int num, struct obj_data *obj, struct char_data *ch, int recur);
 
-/* Subcommands */
-/* For show_obj_to_char 'mode'.	/-- arbitrary */
-#define SHOW_OBJ_LONG     0
-#define SHOW_OBJ_SHORT    1
-#define SHOW_OBJ_ACTION   2
-
-static void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode)
+void show_obj_to_char(struct obj_data *obj, struct char_data *ch, int mode)
 {
   int found = 0;
   struct char_data *temp;
@@ -170,7 +161,7 @@ static void show_obj_modifiers(struct obj_data *obj, struct char_data *ch)
     send_to_char(ch, " ..It emits a faint humming sound!");
 }
 
-static void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show)
+void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show)
 {
   struct obj_data *i, *j, *display;
   bool found;
@@ -829,8 +820,8 @@ ACMD(do_score)
   send_to_char(ch, "Your armor class is %d/10, and your alignment is %d.\r\n",
 	  compute_armor_class(vict), GET_ALIGNMENT(vict));
 
-  send_to_char(ch, "You have %d exp, %d gold coins, and %d questpoints.\r\n",
-	  GET_EXP(vict), GET_GOLD(vict), GET_QUESTPOINTS(vict));
+  send_to_char(ch, "You have %s exp, %s gold coins, and %d questpoints.\r\n",
+	  add_commas(GET_EXP(vict)), add_commas(GET_GOLD(vict)), GET_QUESTPOINTS(vict));
 
   if (GET_LEVEL(vict) < CONFIG_MAX_LEVEL)
     send_to_char(ch, "You need %d exp to reach your next level.\r\n",
@@ -2154,7 +2145,7 @@ ACMD(do_toggle)
         act("$n is now away from $s keyboard.", TRUE, ch, 0, 0, TO_ROOM);
       else {
         act("$n has returned to $s keyboard.", TRUE, ch, 0, 0, TO_ROOM);
-        if (has_mail(GET_IDNUM(ch)))
+        if (has_mail(ch))
           send_to_char(ch, "You have mail waiting.\r\n");
       }
       break;
@@ -2494,7 +2485,7 @@ ACMD(do_whois)
     }
   }
 
-  if (has_mail(GET_IDNUM(victim)))
+  if (has_mail(victim))
      send_to_char (ch, "They have mail waiting.\r\n");
   else
      send_to_char (ch, "They have no mail waiting.\r\n");
diff --git a/src/act.other.c b/src/act.other.c
index c89bb06..18d44ce 100644
--- a/src/act.other.c
+++ b/src/act.other.c
@@ -819,7 +819,7 @@ ACMD(do_gen_tog)
       act("$n has gone AFK.", TRUE, ch, 0, 0, TO_ROOM);
     else {
       act("$n has come back from AFK.", TRUE, ch, 0, 0, TO_ROOM);
-      if (has_mail(GET_IDNUM(ch)))
+      if (has_mail(ch))
         send_to_char(ch, "You have mail waiting.\r\n");
     }
     break;
diff --git a/src/cedit.c b/src/cedit.c
index 33d60a1..1601f07 100644
--- a/src/cedit.c
+++ b/src/cedit.c
@@ -139,6 +139,18 @@ static void cedit_setup(struct descriptor_data *d)
   OLC_CONFIG(d)->autowiz.use_autowiz          = CONFIG_USE_AUTOWIZ;
   OLC_CONFIG(d)->autowiz.min_wizlist_lev      = CONFIG_MIN_WIZLIST_LEV;
 
+  /* Mudmail */
+  OLC_CONFIG(d)->mail.mail_allowed            = CONFIG_CAN_MAIL;
+  OLC_CONFIG(d)->mail.objects_allowed         = CONFIG_CAN_MAIL_OBJ;
+  OLC_CONFIG(d)->mail.gold_allowed            = CONFIG_CAN_MAIL_GOLD;
+  OLC_CONFIG(d)->mail.stamp_cost              = CONFIG_STAMP_COST;
+  OLC_CONFIG(d)->mail.min_level               = CONFIG_MIN_MAIL_LEVEL;
+  OLC_CONFIG(d)->mail.min_free_level          = CONFIG_FREE_MAIL_LEVEL;
+  OLC_CONFIG(d)->mail.allow_drafts            = CONFIG_DRAFTS_ALLOWED;
+  OLC_CONFIG(d)->mail.draft_timeout           = CONFIG_DRAFT_TIMEOUT;
+  OLC_CONFIG(d)->mail.safe_mailing            = CONFIG_SAFE_MAILING;
+  OLC_CONFIG(d)->mail.min_mail_anywhere       = CONFIG_MIN_MAIL_ANYWHERE;
+  OLC_CONFIG(d)->mail.min_send_to_all         = CONFIG_MIN_SEND_TO_ALL;
 
   /* Allocate space for the strings. */
   OLC_CONFIG(d)->play.OK       = str_udup(CONFIG_OK);
@@ -239,6 +251,20 @@ static void cedit_save_internally(struct descriptor_data *d)
   CONFIG_USE_AUTOWIZ          = OLC_CONFIG(d)->autowiz.use_autowiz;
   CONFIG_MIN_WIZLIST_LEV      = OLC_CONFIG(d)->autowiz.min_wizlist_lev;
 
+  /* Mudmail */
+  CONFIG_CAN_MAIL           = OLC_CONFIG(d)->mail.mail_allowed;
+  CONFIG_CAN_MAIL_OBJ       = OLC_CONFIG(d)->mail.objects_allowed;
+  CONFIG_CAN_MAIL_GOLD      = OLC_CONFIG(d)->mail.gold_allowed;
+  CONFIG_STAMP_COST         = OLC_CONFIG(d)->mail.stamp_cost;
+  CONFIG_OBJECT_COST        = OLC_CONFIG(d)->mail.object_cost;
+  CONFIG_MIN_MAIL_LEVEL     = OLC_CONFIG(d)->mail.min_level;
+  CONFIG_FREE_MAIL_LEVEL    = OLC_CONFIG(d)->mail.min_free_level;
+  CONFIG_DRAFTS_ALLOWED     = OLC_CONFIG(d)->mail.allow_drafts;
+  CONFIG_DRAFT_TIMEOUT      = OLC_CONFIG(d)->mail.draft_timeout;
+  CONFIG_SAFE_MAILING       = OLC_CONFIG(d)->mail.safe_mailing;
+  CONFIG_MIN_MAIL_ANYWHERE  = OLC_CONFIG(d)->mail.min_mail_anywhere;
+  CONFIG_MIN_SEND_TO_ALL    = OLC_CONFIG(d)->mail.min_send_to_all;
+
   /* Allocate space for the strings. */
   if (CONFIG_OK)
     free(CONFIG_OK);
@@ -542,6 +568,56 @@ int save_config( IDXTYPE nowhere )
               "min_wizlist_lev = %d\n\n",
               CONFIG_MIN_WIZLIST_LEV);
 
+   /* MUDMAIL OPTIONS */
+  fprintf(fl, "\n\n\n* [ Mudmail Options ]\n");
+
+  fprintf(fl, "* Enable/Disable the whole mudmail system\n"
+              "can_mail = %d\n\n",
+              CONFIG_CAN_MAIL);
+
+  fprintf(fl, "* Can objects be sent via mudmail?\n"
+              "mail_objects_allowed = %d\n\n",
+              CONFIG_CAN_MAIL_OBJ);
+
+  fprintf(fl, "* Can gold coins be sent via mudmail?\n"
+              "mail_gold_allowed = %d\n\n",
+              CONFIG_CAN_MAIL_GOLD);
+
+  fprintf(fl, "* How much does it cost to send mudmails\n"
+              "mail_stamp_cost = %d\n\n",
+              CONFIG_STAMP_COST);
+
+  fprintf(fl, "* How much extra does it cost to add each object mudmails\n"
+              "mail_object_cost = %d\n\n",
+              CONFIG_OBJECT_COST);
+
+  fprintf(fl, "* The minimum player level that's allowed to send mudmails\n"
+              "mail_min_level = %d\n\n",
+              CONFIG_MIN_MAIL_LEVEL);
+
+  fprintf(fl, "* The minimum level that can send mudmails for free\n"
+              "mail_min_free_level = %d\n\n",
+              CONFIG_FREE_MAIL_LEVEL);
+
+  fprintf(fl, "* Are players allowed to create draft mails for sending later?\n"
+              "mail_drafts_allowed = %d\n\n",
+              CONFIG_DRAFTS_ALLOWED);
+
+  fprintf(fl, "* Number of days before a draft mail is autoremoved (0 for never) \n"
+              "mail_draft_timeout = %d\n\n",
+              CONFIG_DRAFT_TIMEOUT);
+
+  fprintf(fl, "* When on, the player cannot be attacked or stolen from while mailing. \n"
+              "mail_safe_mailing = %d\n\n",
+              CONFIG_SAFE_MAILING);
+
+  fprintf(fl, "* This is the minimum level that can send mail from any location (not just at postmaster). \n"
+              "mail_min_mail_anywhere = %d\n\n",
+              CONFIG_MIN_MAIL_ANYWHERE);
+
+  fprintf(fl, "* This is the minimum level that can send mail to all players. \n"
+              "mail_min_send_to_all = %d\n\n",
+              CONFIG_MIN_SEND_TO_ALL);
 
   fclose(fl);
 
@@ -566,6 +642,7 @@ static void cedit_disp_menu(struct descriptor_data *d)
   	  "%sR%s) Room Numbers\r\n"
           "%sO%s) Operation Options\r\n"
           "%sA%s) Autowiz Options\r\n"
+          "%sM%s) Mudmail Options\r\n"
           "%sQ%s) Quit\r\n"
           "Enter your choice : ",
 
@@ -574,6 +651,7 @@ static void cedit_disp_menu(struct descriptor_data *d)
           grn, nrm,
           grn, nrm,
           grn, nrm,
+          grn, nrm,
           grn, nrm
           );
 
@@ -781,6 +859,50 @@ static void cedit_disp_autowiz_options(struct descriptor_data *d)
   OLC_MODE(d) = CEDIT_AUTOWIZ_OPTIONS_MENU;
 }
 
+void cedit_disp_mudmail_options(struct descriptor_data *d)
+{
+  char timeout[MAX_INPUT_LENGTH];
+  get_char_colors(d->character);
+  clear_screen(d);
+
+  if (OLC_CONFIG(d)->mail.draft_timeout > 0)
+    sprintf(timeout, "%d days", OLC_CONFIG(d)->mail.draft_timeout);
+  else
+    sprintf(timeout, "%s<Never!>", cyn);
+
+  write_to_output(d, "\r\n\r\n"
+    "%sA%s) Use mudmail system         : %s%s\r\n"
+    "%sB%s) Allow object attachments   : %s%s\r\n"
+    "%sC%s) Allow gold attachments     : %s%s\r\n"
+    "%sD%s) Stamp Cost (Normal Mails)  : %s%d coins\r\n"
+    "%sE%s) Cost per object attached   : %s%d coins\r\n"
+    "%sF%s) Allow draft mudmails       : %s%s\r\n"
+    "%sG%s) Draft mail timeout         : %s%s\r\n"
+    "%sH%s) Min. level that can mail   : %s%d\r\n"
+    "%sI%s) Min. level for free mail   : %s%d\r\n"
+    "%sJ%s) Safe while mailing?        : %s%s\r\n"
+    "%sK%s) Min level to mail anywhere : %s%d\r\n"
+    "%sL%s) Min level to send to all   : %s%d\r\n"
+    "%sQ%s) Exit To The Main Menu\r\n"
+    "Enter your choice : ",
+    grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->mail.mail_allowed),
+    grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->mail.objects_allowed),
+    grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->mail.gold_allowed),
+    grn, nrm, yel, OLC_CONFIG(d)->mail.stamp_cost,
+    grn, nrm, yel, OLC_CONFIG(d)->mail.object_cost,
+    grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->mail.allow_drafts),
+    grn, nrm, yel, timeout,
+    grn, nrm, yel, OLC_CONFIG(d)->mail.min_level,
+    grn, nrm, yel, OLC_CONFIG(d)->mail.min_free_level,
+    grn, nrm, cyn, CHECK_VAR(OLC_CONFIG(d)->mail.safe_mailing),
+    grn, nrm, yel, OLC_CONFIG(d)->mail.min_mail_anywhere,
+    grn, nrm, yel, OLC_CONFIG(d)->mail.min_send_to_all,
+    grn, nrm
+    );
+
+  OLC_MODE(d) = CEDIT_MUDMAIL_OPTIONS_MENU;
+}
+
 /* The event handler. */
 void cedit_parse(struct descriptor_data *d, char *arg)
 {
@@ -844,6 +966,12 @@ void cedit_parse(struct descriptor_data *d, char *arg)
           OLC_MODE(d) = CEDIT_AUTOWIZ_OPTIONS_MENU;
           break;
 
+        case 'm':
+        case 'M':
+          cedit_disp_mudmail_options(d);
+          OLC_MODE(d) = CEDIT_MUDMAIL_OPTIONS_MENU;
+          break;
+
         case 'q':
         case 'Q':
           write_to_output(d, "Do you wish to save your changes? : ");
@@ -1270,6 +1398,87 @@ void cedit_parse(struct descriptor_data *d, char *arg)
       cedit_disp_autowiz_options(d);
       return;
 
+    case CEDIT_MUDMAIL_OPTIONS_MENU:
+      switch (*arg) {
+        case 'a':
+        case 'A':
+          TOGGLE_VAR(OLC_CONFIG(d)->mail.mail_allowed);
+          break;
+
+        case 'b':
+        case 'B':
+          TOGGLE_VAR(OLC_CONFIG(d)->mail.objects_allowed);
+          break;
+
+        case 'c':
+        case 'C':
+          TOGGLE_VAR(OLC_CONFIG(d)->mail.gold_allowed);
+          break;
+
+        case 'd':
+        case 'D':
+          write_to_output(d, "Enter the cost per mail (without attachments) : ");
+          OLC_MODE(d) = CEDIT_STAMP_COST;
+          return;
+
+        case 'e':
+        case 'E':
+          write_to_output(d, "Enter the cost per object attachment : ");
+          OLC_MODE(d) = CEDIT_OBJECT_COST;
+          return;
+
+        case 'f':
+        case 'F':
+          TOGGLE_VAR(OLC_CONFIG(d)->mail.allow_drafts);
+          break;
+
+        case 'g':
+        case 'G':
+          write_to_output(d, "Enter the timeout (in days) before draft mails are auto-removed (0=off) : ");
+          OLC_MODE(d) = CEDIT_DRAFT_TIMEOUT;
+          return;
+
+        case 'h':
+        case 'H':
+          write_to_output(d, "Enter the minimum admin level that can send mudmails : ");
+          OLC_MODE(d) = CEDIT_MIN_MAIL_LEVEL;
+          return;
+
+        case 'i':
+        case 'I':
+          write_to_output(d, "Enter the minimum admin level for free mudmails : ");
+          OLC_MODE(d) = CEDIT_MIN_FREE_LEVEL;
+          return;
+
+        case 'j':
+        case 'J':
+          TOGGLE_VAR(OLC_CONFIG(d)->mail.safe_mailing);
+          break;
+
+        case 'k':
+        case 'K':
+          write_to_output(d, "Enter the minimum admin level that can send mail from anywhere : ");
+          OLC_MODE(d) = CEDIT_MAIL_ANYWHERE;
+          return;
+
+        case 'l':
+        case 'L':
+          write_to_output(d, "Enter the minimum admin level that can send to all players : ");
+          OLC_MODE(d) = CEDIT_MAIL_ALL_PLAYERS;
+          return;
+
+        case 'q':
+        case 'Q':
+          cedit_disp_menu(d);
+          return;
+
+        default:
+          write_to_output(d, "\r\nThat is an invalid choice!\r\n");
+      }
+
+      cedit_disp_mudmail_options(d);
+      return;
+
     case CEDIT_LEVEL_CAN_SHOUT:
       if (!*arg) {
         write_to_output(d,
@@ -1666,6 +1875,41 @@ void cedit_parse(struct descriptor_data *d, char *arg)
       }
       break;
 
+    case CEDIT_STAMP_COST:
+      OLC_CONFIG(d)->mail.stamp_cost = MIN(MAX(atoi(arg), 0), 1000);
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_OBJECT_COST:
+      OLC_CONFIG(d)->mail.object_cost = MIN(MAX(atoi(arg), 0), 1000);
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_DRAFT_TIMEOUT:
+      OLC_CONFIG(d)->mail.draft_timeout = MIN(MAX(atoi(arg), 0), 3653); /* up to 10 years */
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_MIN_MAIL_LEVEL:
+      OLC_CONFIG(d)->mail.min_level = MIN(MAX(atoi(arg), 0), ADMLVL_IMPL);
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_MIN_FREE_LEVEL:
+      OLC_CONFIG(d)->mail.min_free_level = MIN(MAX(atoi(arg), 0), ADMLVL_IMPL);
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_MAIL_ANYWHERE:
+      OLC_CONFIG(d)->mail.min_mail_anywhere = MIN(MAX(atoi(arg), 0), ADMLVL_IMPL);
+      cedit_disp_mudmail_options(d);
+      break;
+
+    case CEDIT_MAIL_ALL_PLAYERS:
+      OLC_CONFIG(d)->mail.min_send_to_all = MIN(MAX(atoi(arg), 0), ADMLVL_IMPL);
+      cedit_disp_mudmail_options(d);
+      break;
+
     default:  /* We should never get here, but just in case... */
       cleanup_olc(d, CLEANUP_CONFIG);
       mudlog(BRF, ADMLVL_BUILDER, TRUE, "SYSERR: OLC: cedit_parse(): Reached default case!");
diff --git a/src/db.c b/src/db.c
index 51cfced..abf9ece 100644
--- a/src/db.c
+++ b/src/db.c
@@ -80,7 +80,7 @@ qst_rnum total_quests = 0;      /* top of autoquest table        */
 struct shop_data *shop_index;   /* index table for shops         */
 int top_shop = -1;              /* top of shop table             */
 
-int no_mail = 0;                /* mail disabled?		 */
+int can_mail = 1;               /* mail enabled?		 */
 int mini_mud = 0;               /* mini-mud mode?		 */
 int no_rent_check = 0;          /* skip rent check on boot?	 */
 time_t boot_time = 0;           /* time of mud boot		 */
@@ -704,10 +704,11 @@ void boot_db(void)
   sort_spells();
 
   log("Booting mail system.");
-  if (!scan_file()) {
+  if (!build_mail_index()) {
     log("    Mail boot failed -- Mail system disabled");
-    no_mail = 1;
+    can_mail = 0;
   }
+
   log("Reading banned site and invalid-name list.");
   load_banned();
   read_invalid_list();
diff --git a/src/db.h b/src/db.h
index 5582760..b08deda 100644
--- a/src/db.h
+++ b/src/db.h
@@ -34,6 +34,7 @@
 #define LIB_PLROBJS	":plrobjs:"
 #define LIB_PLRVARS	":plrvars:"
 #define LIB_PLRFILES	":plrfiles:"
+#define LIB_MLFILES     ":mudmail:"
 #define LIB_HOUSE	":house:"
 #define SLASH		":"
 #elif defined(CIRCLE_AMIGA) || defined(CIRCLE_UNIX) || defined(CIRCLE_WINDOWS) || defined(CIRCLE_ACORN) || defined(CIRCLE_VMS)
@@ -47,6 +48,7 @@
 #define LIB_PLRVARS	"plrvars/"
 #define LIB_HOUSE	"house/"
 #define LIB_PLRFILES    "plrfiles/"
+#define LIB_MLFILES     "mudmail/"
 #define SLASH		"/"
 #else
 #error "Unknown path components."
@@ -56,6 +58,7 @@
 #define SUF_TEXT	"text"
 #define SUF_MEM	        "mem"
 #define SUF_PLR		"plr"
+#define SUF_MAIL	"ml"
 
 #if defined(CIRCLE_AMIGA)
 #define EXE_FILE "/bin/circle" /* maybe use argv[0] but it's not reliable */
@@ -351,7 +354,7 @@ extern int top_of_helpt;
 extern struct help_index_element *help_table;
 
 /* Mud configurable variables */
-extern int no_mail;
+extern int can_mail;
 extern int mini_mud;
 extern int no_rent_check;
 extern time_t boot_time;
diff --git a/src/dg_mobcmd.c b/src/dg_mobcmd.c
index 635e587..29c91c7 100644
--- a/src/dg_mobcmd.c
+++ b/src/dg_mobcmd.c
@@ -22,14 +22,13 @@
 #include "genzon.h" /* for real_zone_by_thing */
 #include "act.h"
 #include "fight.h"
-
+#include "mail.h"
 
 /* Local file scope functions. */
-static void mob_log(char_data *mob, const char *format, ...);
 
 
 /* attaches mob's name and vnum to msg and sends it to script_log */
-static void mob_log(char_data *mob, const char *format, ...)
+void mob_log(char_data *mob, const char *format, ...)
 {
   va_list args;
   char output[MAX_STRING_LENGTH];
@@ -1155,3 +1154,101 @@ ACMD(do_mrecho)
     else
       send_to_range(atoi(start), atoi(finish), "%s\r\n", msg);
 }
+
+/* Mailing functions */
+ACMD(do_mmail)
+{
+    char arg[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH], *arg3;
+    char buf[MAX_STRING_LENGTH];
+    char_data *victim;
+    long recipient = MAIL_TO_NOBODY;
+    obj_vnum o_num;
+    struct obj_data *obj;
+
+    if (!MOB_OR_IMPL(ch)) {
+        send_to_char(ch, "Huh?!?\r\n");
+        return;
+    }
+
+    arg3 = two_arguments(argument, arg, arg2);
+
+    if (!*arg) {
+        mob_log(ch, "mmail called with no argument");
+        return;
+    } else if (!strcmp(arg, "recipient")) {
+      create_mob_mail(ch);
+      if (*arg2 == UID_CHAR) {
+        if (!(victim = get_char(arg2))) {
+          mob_log(ch, "mmail: recipient (%s) not found",arg2);
+          return;
+        }
+      } else if (!(victim = get_char_vis(ch, arg2, NULL, FIND_CHAR_WORLD))) {
+          /* Check special cases and mail groups */
+          if ((recipient = get_mail_group_by_name(arg2)) == MAIL_TO_NOBODY) {
+            mob_log(ch,"mmail: victim (%s) does not exist", arg2);
+            return;
+          }
+      } else if (victim == ch) {
+          mob_log(ch, "mmail: victim is self");
+          return;
+      } else if (IS_NPC(victim)) {
+          mob_log(ch, "mmail: victim is another mob");
+          return;
+      } else {
+        /* all name checks passed - get the recipient ID */
+        recipient = GET_ID(victim);
+	  }
+      if (!add_recipient(MOB_MAIL(ch), recipient)) {
+        mob_log(ch, "mmail failed to add recipient");
+        return;
+      }
+    } else if (!strcmp(arg, "object")) {
+      create_mob_mail(ch);
+      o_num = atoi(arg2);
+      if (!real_object(o_num)) {
+        mob_log(ch, "mmail: invalid object vnum");
+        return;
+	  }
+	  if ((obj = read_object(o_num, VIRTUAL)) == NULL) {
+        mob_log(ch, "mmail: invalid object to load");
+        return;
+	  }
+	  obj_to_mail(obj, MOB_MAIL(ch)->mail);
+    } else if (!strcmp(arg, "subject")) {
+      create_mob_mail(ch);
+      sprintf(buf, "%s%s", arg2, arg3);
+      if ((MOB_MAIL(ch)->mail)->subject)
+        free((MOB_MAIL(ch)->mail)->subject);
+      (MOB_MAIL(ch)->mail)->subject = strdup(buf);
+    } else if (!strcmp(arg, "body")) {
+      create_mob_mail(ch);
+      if ((MOB_MAIL(ch)->mail)->body)
+        free((MOB_MAIL(ch)->mail)->body);
+      (MOB_MAIL(ch)->mail)->body = strdup(buf);
+    } else if (!strcmp(arg, "gold")) {
+      create_mob_mail(ch);
+      (MOB_MAIL(ch)->mail)->coins = atol(arg2);
+    } else if (!strcmp(arg, "urgent")) {
+      create_mob_mail(ch);
+      TOGGLE_BIT_AR((MOB_MAIL(ch)->mail)->mail_flags, MAIL_URGENT);
+    } else if (!strcmp(arg, "cod")) {
+      create_mob_mail(ch);
+      TOGGLE_BIT_AR((MOB_MAIL(ch)->mail)->mail_flags, MAIL_COD);
+    } else if (!strcmp(arg, "send")) {
+      if (mail_from_mobile(ch)== FALSE)
+        mob_log(ch, "mmail: send failed.");
+    } else if (!strcmp(arg, "new")) {
+      create_mob_mail(ch);
+      clear_mail_data(MOB_MAIL(ch)->mail);
+    } else if ((!strcmp(arg, "view")) ||
+               (!strcmp(arg, "show")) ||
+               (!strcmp(arg, "echo")) ||
+               (!strcmp(arg, "list")) ) {
+      create_mob_mail(ch);
+      send_to_room(IN_ROOM(ch), "%s\r\n", get_mail_text(MOB_MAIL(ch)->mail) );
+      send_to_room(IN_ROOM(ch), "Recipients: %s\r\n", recipient_list(MOB_MAIL(ch)) );
+    } else {
+      mob_log(ch, "mmail: unknown %mail% command (%s).", arg);
+    }
+    return;
+}
diff --git a/src/dg_scripts.h b/src/dg_scripts.h
index cbf73aa..79319ad 100644
--- a/src/dg_scripts.h
+++ b/src/dg_scripts.h
@@ -363,6 +363,7 @@ int valid_dg_target(char_data *ch, int bitvector);
 void script_damage(char_data *vict, int dam);
 
 /* from dg_mobcmd.c */
+void mob_log(char_data *mob, const char *format, ...);
 ACMD(do_masound);
 ACMD(do_mat);
 ACMD(do_mdamage);
@@ -377,6 +378,7 @@ ACMD(do_mhunt);
 ACMD(do_mjunk);
 ACMD(do_mkill);
 ACMD(do_mload);
+ACMD(do_mmail);
 ACMD(do_mpurge);
 ACMD(do_mrecho);
 ACMD(do_mremember);
diff --git a/src/dg_variables.c b/src/dg_variables.c
index b9f81a6..373cd05 100644
--- a/src/dg_variables.c
+++ b/src/dg_variables.c
@@ -232,6 +232,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
   char *recho[]          = {"mrecho ",      "orecho ",      "wrecho "     };
   /* there is no such thing as mmove, thus the mecho below  */
   char *omove[]          = {"mecho ",      "omove ",      "wmove "     };
+  char *mail[]           = {"mmail ",       "oecho ",       "wecho "      };
 
   *str = '\0';
 
@@ -300,6 +301,8 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
         snprintf(str, slen, "%s", recho[type]);
       else if (!str_cmp(var, "move"))
         snprintf(str, slen, "%s", omove[type]);
+      else if (!str_cmp(var, "mail"))
+        snprintf(str, slen, "%s", mail[type]);
       else
         *str = '\0';
     }
diff --git a/src/handler.c b/src/handler.c
index aa23a6f..2838850 100644
--- a/src/handler.c
+++ b/src/handler.c
@@ -22,6 +22,7 @@
 #include "class.h"
 #include "fight.h"
 #include "quest.h"
+#include "mail.h"
 
 /* local file scope variables */
 static int extractions_pending = 0;
@@ -765,6 +766,37 @@ void obj_from_obj(struct obj_data *obj)
   obj->next_content = NULL;
 }
 
+/* Attach an object into a mudmail */
+void obj_to_mail(struct obj_data *object, struct mail_data *mail)
+{
+  if (!object || !mail)
+    log("SYSERR: Illegal value(s) passed to obj_to_mail. (Mail ID %ld, obj %p)",	mail ? mail->mail_id : 0, object);
+  else {
+    object->next_content = mail->attachment;
+    mail->attachment = object;
+    IN_MAIL(object) = mail;
+    IN_ROOM(object) = NOWHERE;
+    object->carried_by = NULL;
+  }
+}
+
+/* Take an object from a mudmail */
+void obj_from_mail(struct obj_data *object)
+{
+  struct obj_data *temp;
+
+  if (!object || IN_ROOM(object) != NOWHERE || object->carried_by) {
+    log("SYSERR: NULL object (%p) or obj not attached to a mail passed to obj_from_mail", object);
+    return;
+  }
+
+  REMOVE_FROM_LIST(object, (IN_MAIL(object))->attachment, next_content);
+
+  IN_MAIL(object) = NULL;
+  IN_ROOM(object) = NOWHERE;
+  object->next_content = NULL;
+}
+
 /* Set all carried_by to point to new owner */
 void object_list_new_owner(struct obj_data *list, struct char_data *ch)
 {
diff --git a/src/handler.h b/src/handler.h
index da14948..e4ee1bc 100644
--- a/src/handler.h
+++ b/src/handler.h
@@ -1,13 +1,13 @@
 /**
 * @file handler.h
 * Prototypes of handling and utility functions.
-* 
+*
 * Part of the core tbaMUD source code distribution, which is a derivative
 * of, and continuation of, CircleMUD.
-*                                                                        
-* All rights reserved.  See license for complete information.                                                                
-* Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University 
-* CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               
+*
+* All rights reserved.  See license for complete information.
+* Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University
+* CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.
 */
 #ifndef _HANDLER_H_
 #define _HANDLER_H_
@@ -41,6 +41,8 @@ void	obj_to_room(struct obj_data *object, room_rnum room);
 void	obj_from_room(struct obj_data *object);
 void	obj_to_obj(struct obj_data *obj, struct obj_data *obj_to);
 void	obj_from_obj(struct obj_data *obj);
+void    obj_to_mail(struct obj_data *object, struct mail_data *mail);
+void    obj_from_mail(struct obj_data *object);
 void	object_list_new_owner(struct obj_data *list, struct char_data *ch);
 
 void	extract_obj(struct obj_data *obj);
diff --git a/src/interpreter.c b/src/interpreter.c
index 347511f..d125b67 100644
--- a/src/interpreter.c
+++ b/src/interpreter.c
@@ -221,7 +221,7 @@ cpp_extern const struct command_info cmd_info[] = {
 
   { "motd"     , "motd"    , POS_DEAD    , do_gen_ps    , 0, ADMLVL_MORTAL,  ADM_NONE,  SCMD_MOTD },
   { "mortal"   , "mort"    , POS_DEAD    , do_mortal    , 0, ADMLVL_MORTAL,  ADM_NONE,  0 },
-  { "mail"     , "mail"    , POS_STANDING, do_not_here  , 1, ADMLVL_MORTAL,  ADM_NONE,  0 },
+  { "mail"     , "mail"    , POS_STANDING, do_mail      , 1, ADMLVL_MORTAL,  ADM_NONE,  0 },
   { "map"      , "map"     , POS_STANDING, do_map       , 1, ADMLVL_MORTAL,  ADM_NONE,  0 },
   { "medit"    , "med"     , POS_DEAD    , do_oasis_medit,0, ADMLVL_BUILDER, ADM_NONE,  0 },
   { "mlist"    , "mlist"   , POS_DEAD    , do_oasis_list, 0, ADMLVL_BUILDER, ADM_BUILD, SCMD_OASIS_MLIST },
@@ -406,6 +406,7 @@ cpp_extern const struct command_info cmd_info[] = {
   { "mtransform", do_mtransform , 0 },
   { "mzoneecho", do_mzoneecho, 0 },
   { "mfollow"  , do_mfollow  , 0 },
+  { "mmail"    , do_mmail    , 0 },
   { "\n" , do_not_here , 0 } };
 
 int script_command_interpreter(struct char_data *ch, char *arg) {
@@ -1194,7 +1195,7 @@ static int perform_dupe_check(struct descriptor_data *d)
     write_to_output(d, "Reconnecting.\r\n");
     act("$n has reconnected.", TRUE, d->character, 0, 0, TO_ROOM);
     mudlog(NRM, MAX(ADMLVL_IMMORT, GET_INVIS_LEV(d->character)), TRUE, "%s [%s] has reconnected.", GET_NAME(d->character), d->host);
-    if (has_mail(GET_IDNUM(d->character)))
+    if (has_mail(d->character))
       write_to_output(d, "You have mail waiting.\r\n");
     break;
   case USURP:
@@ -1341,6 +1342,7 @@ void nanny(struct descriptor_data *d, char *arg)
     { CON_PREFEDIT, prefedit_parse },
     { CON_IBTEDIT, ibtedit_parse },
     { CON_HSEDIT, hsedit_parse },
+    { CON_MAILEDIT, mailedit_parse },
     { -1, NULL }
   };
 
@@ -1675,8 +1677,8 @@ void nanny(struct descriptor_data *d, char *arg)
         send_to_char(d->character, "%s", CONFIG_START_MESSG);
       }
       look_at_room(d->character, 0);
-      if (has_mail(GET_IDNUM(d->character)))
-        send_to_char(d->character, "You have mail waiting.\r\n");
+      if (has_mail(d->character))
+        notify_on_login(d->character);
       if (load_result == 2) {	/* rented items lost */
         send_to_char(d->character, "\r\n\007You could not afford your rent!\r\n"
 		"Your possesions have been donated to the Salvation Army!\r\n");
diff --git a/src/mail.c b/src/mail.c
index f57eecc..02a8d96 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -1,380 +1,2070 @@
-/**************************************************************************
-*  File: mail.c                                            Part of tbaMUD *
-*  Usage: Internal funcs and player spec-procs of mudmail system.         *
-*                                                                         *
-*  All rights reserved.  See license for complete information.            *
-*                                                                         *
-*  Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
-*  CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               *
-*  By Jeremy Elson. Rewritten by Welcor.                                  *
-**************************************************************************/
-
-#include "conf.h"
-#include "sysdep.h"
-#include "structs.h"
-#include "utils.h"
-#include "comm.h"
-#include "db.h"
-#include "interpreter.h"
-#include "handler.h"
-#include "mail.h"
-#include "modify.h"
-
-/* local (file scope) function prototypes */
-static void postmaster_send_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
-static void postmaster_check_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
-static void postmaster_receive_mail(struct char_data *ch, struct char_data *mailman, int cmd, char *arg);
-static int mail_recip_ok(const char *name);
-static void write_mail_record(FILE *mail_file, struct mail_t *record);
-static void free_mail_record(struct mail_t *record);
-static struct mail_t *read_mail_record(FILE *mail_file);
-
-static int mail_recip_ok(const char *name)
-{
-  int player_i, ret = FALSE;
-
-  if ((player_i = get_ptable_by_name(name)) >= 0) {
-    if (!IS_SET(player_table[player_i].flags, PINDEX_DELETED))
-      ret = TRUE;
-  }
-  return ret;
-}
-
-static void free_mail_record(struct mail_t *record)
-{
-	if (record->body)
-		free(record->body);
-  free(record);
-}
-
-static struct mail_t *read_mail_record(FILE *mail_file)
-{
-  char line[READ_SIZE];
-  long sender, recipient;
-  time_t sent_time;
-  struct mail_t *record;
-
-  if (!get_line(mail_file, line))
-  	return NULL;
-
-  if (sscanf(line, "### %ld %ld %ld", &recipient, &sender, (long *)&sent_time) != 3) {
-  	log("Mail system - fatal error - malformed mail header");
-  	log("Line was: %s", line);
-  	return NULL;
-  }
-
-  CREATE(record, struct mail_t, 1);
-
-  record->recipient = recipient;
-  record->sender = sender;
-  record->sent_time = sent_time;
-  record->body = fread_string(mail_file, "read mail record");
-
-  return record;
-}
-
-static void write_mail_record(FILE *mail_file, struct mail_t *record)
-{
-	fprintf(mail_file, "### %ld %ld %ld\n"
-	                   "%s~\n",
-                     record->recipient,
-                     record->sender,
-                     (long)record->sent_time,
-                     record->body );
-}
-
-/* int scan_file(none)
- * Returns false if mail file is corrupted or true if everything correct.
- *
- * This is called once during boot-up.  It scans through the mail file
- * and indexes all entries currently in the mail file. */
-int scan_file(void)
-{
-  FILE *mail_file;
-  int count = 0;
-  struct mail_t *record;
-
-  if (!(mail_file = fopen(MAIL_FILE, "r"))) {
-    log("   Mail file non-existant... creating new file.");
-    touch(MAIL_FILE);
-    return TRUE;
-  }
-
-  record = read_mail_record(mail_file);
-
-  while (record) {
-    free_mail_record(record);
-    record = read_mail_record(mail_file);
-    count++;
-  }
-
-  fclose(mail_file);
- 	log("   Mail file read -- %d messages.", count);
- 	return TRUE;
-}
-
-/* int has_mail(long #1)
- * #1 - id number of the person to check for mail.
- * Returns true or false.
- *
- * A simple little function which tells you if the player has mail or not. */
-int has_mail(long recipient)
-{
-  FILE *mail_file;
-  struct mail_t *record;
-
-  if (!(mail_file = fopen(MAIL_FILE, "r"))) {
-    perror("read_delete: Mail file not accessible.");
-    return FALSE;
-  }
-
-  record = read_mail_record(mail_file);
-
-  while (record) {
-  	if (record->recipient == recipient) {
-  		free_mail_record(record);
-  		fclose(mail_file);
-  		return TRUE;
-    }
-    free_mail_record(record);
-    record = read_mail_record(mail_file);
-  }
-  fclose(mail_file);
-  return FALSE;
-}
-
-/* void store_mail(long #1, long #2, char * #3)
- * #1 - id number of the person to mail to.
- * #2 - id number of the person the mail is from.
- * #3 - The actual message to send.
- *
- * call store_mail to store mail.  (hard, huh? :-) )  Pass 3 arguments:
- * who the mail is to (long), who it's from (long), and a pointer to the
- * actual message text (char *). */
-void store_mail(long to, long from, char *message_pointer)
-{
-  FILE *mail_file;
-  struct mail_t *record;
-
-  if (!(mail_file = fopen(MAIL_FILE, "a"))) {
-    perror("store_mail: Mail file not accessible.");
-    return;
-  }
-  CREATE(record, struct mail_t, 1);
-
-  record->recipient = to;
-  record->sender = from;
-  record->sent_time = time(0);
-  record->body = message_pointer;
-
-  write_mail_record(mail_file, record);
-  free(record); /* don't free the body */
-  fclose(mail_file);
-}
-
-/* char *read_delete(long #1)
- * #1 - The id number of the person we're checking mail for.
- * Returns the message text of the mail received.
- *
- * Retrieves one messsage for a player. The mail is then discarded from
- * the file. Expects mail to exist. */
-char *read_delete(long recipient)
-{
-  FILE *mail_file, *new_file;
-  struct mail_t *record, *record_to_keep = NULL;
-  char buf[MAX_STRING_LENGTH];
-
-  if (!(mail_file = fopen(MAIL_FILE, "r"))) {
-    perror("read_delete: Mail file not accessible.");
-    return strdup("Mail system malfunction - please report this");
-  }
-
-  if (!(new_file = fopen(MAIL_FILE_TMP, "w"))) {
-    perror("read_delete: new Mail file not accessible.");
-    fclose(mail_file);
-    return strdup("Mail system malfunction - please report this");
-  }
-
-  record = read_mail_record(mail_file);
-
-  while (record) {
-  	if (!record_to_keep && record->recipient == recipient) {
-  		record_to_keep = record;
-  		record = read_mail_record(mail_file);
-  		continue; /* don't write and free this one just yet */
-    }
-    write_mail_record(new_file, record);
-    free_mail_record(record);
-    record = read_mail_record(mail_file);
-  }
-
-  if (!record_to_keep)
-  	sprintf(buf, "Mail system error - please report");
-  else {
-    char *tmstr, *from, *to;
-
-    tmstr = asctime(localtime(&record_to_keep->sent_time));
-    *(tmstr + strlen(tmstr) - 1) = '\0';
-
-    from = get_name_by_id(record_to_keep->sender);
-    to = get_name_by_id(record_to_keep->recipient);
-
- 		snprintf(buf, sizeof(buf),
-             " * * * * tbaMUD Mail System * * * *\r\n"
-             "Date: %s\r\n"
-             "To  : %s\r\n"
-             "From: %s\r\n"
-             "\r\n"
-             "%s",
-
-             tmstr,
-             to ? to : "Unknown",
-             from ? from : "Unknown",
-             record_to_keep->body ? record_to_keep->body : "No message" );
-
-    free_mail_record(record_to_keep);
-  }
-  fclose(mail_file);
-  fclose(new_file);
-
-  remove(MAIL_FILE);
-  rename(MAIL_FILE_TMP, MAIL_FILE);
-
-  return strdup(buf);
-}
-
-/* spec_proc for a postmaster using the above routines.  By Jeremy Elson */
-SPECIAL(postmaster)
-{
-  if (!ch->desc || IS_NPC(ch))
-    return (0);			/* so mobs don't get caught here */
-
-  if (!(CMD_IS("mail") || CMD_IS("check") || CMD_IS("receive")))
-    return (0);
-
-  if (no_mail) {
-    send_to_char(ch, "Sorry, the mail system is having technical difficulties.\r\n");
-    return (0);
-  }
-
-  if (CMD_IS("mail")) {
-    postmaster_send_mail(ch, (struct char_data *)me, cmd, argument);
-    return (1);
-  } else if (CMD_IS("check")) {
-    postmaster_check_mail(ch, (struct char_data *)me, cmd, argument);
-    return (1);
-  } else if (CMD_IS("receive")) {
-    postmaster_receive_mail(ch, (struct char_data *)me, cmd, argument);
-    return (1);
-  } else
-    return (0);
-}
-
-static void postmaster_send_mail(struct char_data *ch, struct char_data *mailman,
-			  int cmd, char *arg)
-{
-  long recipient;
-  char buf[MAX_INPUT_LENGTH], **mailwrite;
-
-  if (GET_LEVEL(ch) < MIN_MAIL_LEVEL) {
-    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, you have to be level %d to send mail!'", MIN_MAIL_LEVEL);
-    act(buf, FALSE, mailman, 0, ch, TO_VICT);
-    return;
-  }
-  one_argument(arg, buf);
-
-  if (!*buf) {			/* you'll get no argument from me! */
-    act("$n tells you, 'You need to specify an addressee!'",
-	FALSE, mailman, 0, ch, TO_VICT);
-    return;
-  }
-  if (GET_GOLD(ch) < STAMP_PRICE && !ADM_FLAGGED(ch, ADM_MONEY)) {
-    snprintf(buf, sizeof(buf), "$n tells you, 'A stamp costs %d coin%s.'\r\n"
-	    "$n tells you, '...which I see you can't afford.'", STAMP_PRICE,
-            STAMP_PRICE == 1 ? "" : "s");
-    act(buf, FALSE, mailman, 0, ch, TO_VICT);
-    return;
-  }
-  if ((recipient = get_id_by_name(buf)) < 0 || !mail_recip_ok(buf)) {
-    act("$n tells you, 'No one by that name is registered here!'",
-	FALSE, mailman, 0, ch, TO_VICT);
-    return;
-  }
-  act("$n starts to write some mail.", TRUE, ch, 0, 0, TO_ROOM);
-
-  if (ADM_FLAGGED(ch, ADM_MONEY))
-    snprintf(buf, sizeof(buf), "$n tells you, 'Your mail is free.'\r\n"
-       "$n tells you, 'Write your message. (/s saves /h for help).'");
-  else
-    snprintf(buf, sizeof(buf), "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
-       "$n tells you, 'Write your message. (/s saves /h for help).'",
-	  STAMP_PRICE);
-
-  act(buf, FALSE, mailman, 0, ch, TO_VICT);
-
-  if (!ADM_FLAGGED(ch, ADM_MONEY))
-    decrease_gold(ch, STAMP_PRICE);
-
-  SET_BIT_AR(PLR_FLAGS(ch), PLR_MAILING);	/* string_write() sets writing. */
-
-  /* Start writing! */
-  CREATE(mailwrite, char *, 1);
-  string_write(ch->desc, mailwrite, MAX_MAIL_SIZE, recipient, NULL);
-}
-
-static void postmaster_check_mail(struct char_data *ch, struct char_data *mailman,
-			  int cmd, char *arg)
-{
-  if (has_mail(GET_IDNUM(ch)))
-    act("$n tells you, 'You have mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
-  else
-    act("$n tells you, 'Sorry, you don't have any mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
-}
-
-static void postmaster_receive_mail(struct char_data *ch, struct char_data *mailman,
-			  int cmd, char *arg)
-{
-  char buf[256];
-  struct obj_data *obj;
-  int y;
-
-  if (!has_mail(GET_IDNUM(ch))) {
-    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, you don't have any mail waiting.'");
-    act(buf, FALSE, mailman, 0, ch, TO_VICT);
-    return;
-  }
-  while (has_mail(GET_IDNUM(ch))) {
-    obj = create_obj();
-    obj->item_number = 1;
-    obj->name = strdup("mail paper letter");
-    obj->short_description = strdup("a piece of mail");
-    obj->description = strdup("Someone has left a piece of mail here.");
-
-    GET_OBJ_TYPE(obj) = ITEM_NOTE;
-    for(y = 0; y < TW_ARRAY_MAX; y++)
-      obj->obj_flags.wear_flags[y] = 0;
-    SET_BIT_AR(GET_OBJ_WEAR(obj), ITEM_WEAR_TAKE);
-    GET_OBJ_WEIGHT(obj) = 1;
-    GET_OBJ_COST(obj) = 30;
-    GET_OBJ_RENT(obj) = 10;
-    obj->action_description = read_delete(GET_IDNUM(ch));
-
-    if (obj->action_description == NULL)
-      obj->action_description =
-	strdup("Mail system error - please report.  Error #11.\r\n");
-
-    obj_to_char(obj, ch);
-
-    act("$n gives you a piece of mail.", FALSE, mailman, 0, ch, TO_VICT);
-    act("$N gives $n a piece of mail.", FALSE, ch, 0, mailman, TO_ROOM);
-  }
-}
-
-void notify_if_playing(struct char_data *from, int recipient_id)
-{
-  struct descriptor_data *d;
-
-  for (d = descriptor_list; d; d = d->next)
-    if ((IS_PLAYING(d)) && (GET_IDNUM(d->character) == recipient_id) && (has_mail(GET_IDNUM(d->character))))
-      send_to_char(d->character, "You have new mudmail from %s.\r\n", GET_NAME(from));
-}
+/**************************************************************************
+*  File: mail.c                                            Part of tbaMUD *
+*  Usage: Internal funcs and player spec-procs of mudmail system.         *
+*                                                                         *
+*  All rights reserved.  See license for complete information.            *
+*                                                                         *
+*  Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University *
+*  CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.               *
+*  By Jeremy Elson. Rewritten by Welcor and Jamdog                        *
+**************************************************************************/
+
+#include <sys/stat.h>
+#include <dirent.h>
+
+#include "conf.h"
+#include "sysdep.h"
+#include "structs.h"
+#include "utils.h"
+#include "comm.h"
+#include "db.h"
+#include "interpreter.h"
+#include "handler.h"
+#include "modify.h"
+#include "act.h"
+#include "genolc.h"
+#include "dg_scripts.h"
+#include "mail.h"
+#include "screen.h"
+
+/* Local Global Variables */
+struct mail_index *mail_table = NULL;  /* mail_table is index - mails are loaded as necessary */
+int top_of_mail_table=-1;
+int top_mail_idnum=-1;
+
+/* Also need an adjustment to perform_send_to_groups below */
+const struct mail_group mail_groups[NUM_MAIL_GROUPS+1] = {
+    {"immortals", MAIL_TO_IMMS},
+    {"all",       MAIL_TO_ALL},
+    {"\n",        MAIL_TO_NOBODY}};
+
+/* build_mail_index: loads the mudmail index */
+bool build_mail_index(void)
+{
+  int rec_count = 0, i, count=0;
+  FILE *ml_index;
+  char index_name[40], line[256], bits[64];
+  char subj[80], *strptr;
+
+  sprintf(index_name, "%s%s", LIB_MLFILES, INDEX_FILE);
+  if (!(ml_index = fopen(index_name, "r"))) {
+    top_of_mail_table = -1;
+    log("No mail index file!  Creating new one!");
+    return (save_mail_index());
+  }
+
+  while (get_line(ml_index, line))
+    if (*line != '~' && *line != '$' && *line != '#')  /* Index file can end in ~ or $ */
+      rec_count++;
+  rewind(ml_index);
+
+  if (rec_count == 0) {
+    mail_table = NULL;
+    top_of_mail_table = -1;
+    return TRUE;
+  }
+
+  CREATE(mail_table, struct mail_index, rec_count);
+  for (i = 0; i < rec_count; i++) {
+    get_line(ml_index, line);
+    while (*line && *line == '#') get_line(ml_index, line);  /* Skip comments */
+    if ((sscanf(line, "%ld %s %ld %ld %ld %s", &mail_table[i].mail_id, bits, &mail_table[i].sender,
+                                               &mail_table[i].recipient, &mail_table[i].sent_time, subj)) != 6) {
+
+    }
+    if (!strcmp(subj, "(null)")) {
+      mail_table[i].subject = NULL;
+    } else {
+      count = 0;
+	  /* sscanf only grabs the first word of the subject, get it all! */
+	  for (strptr=line; strptr && *strptr && count<5; strptr++)
+	    if (*strptr == ' ') count++;
+	  if (strptr && *strptr) {
+        mail_table[i].subject = strdup(strptr);
+      } else {
+        mail_table[i].subject = NULL;
+      }
+	}
+    mail_table[i].flags = asciiflag_conv(bits);
+    top_mail_idnum = MAX(top_mail_idnum, mail_table[i].mail_id);
+  }
+
+  fclose(ml_index);
+  top_of_mail_table = i - 1;
+  return TRUE;
+}
+
+
+/* Find an usused unique mail ID */
+long new_mail_id(void)
+{
+  int i,j;
+
+  /* Have we allocated all mail numbers yet? */
+  if (top_mail_idnum < MAX_MAIL_ID) {
+	top_mail_idnum++;
+	return (top_mail_idnum);
+  }
+
+  /* Oops, we reached the max!
+     check through all the other numbers to find one that has been deleted */
+  for (i=0; i<MAX_MAIL_ID; i++) {
+    /* loop through mail index table until id is found */
+    for (j=0; j<=top_of_mail_table && mail_table[j].mail_id != i; j++) {
+      /* We got to the end without finding it - it doesn't exist */
+      if (j == (top_of_mail_table - 1)) return i;
+    }
+  }
+  /* wasn't found - return -1 */
+  return NO_MAIL;
+}
+
+void free_mail_index(void)
+{
+  int tm;
+
+  if (!mail_table)
+    return;
+
+  for (tm = 0; tm <= top_of_mail_table; tm++)
+    if (mail_table[tm].subject)
+      free(mail_table[tm].subject);
+
+  free(mail_table);
+  mail_table = NULL;
+  top_of_mail_table = -1;
+}
+
+
+void extract_mail(struct mail_data *mail)
+{
+  struct obj_data *obj, *next_obj;
+
+  if (mail->subject)
+    free(mail->subject);
+
+  if (mail->body)
+    free(mail->body);
+
+  /* Extract all attached objects */
+  if (mail->attachment) {
+    obj = mail->attachment;
+    next_obj = obj->next_content;
+    while (obj) {
+      extract_obj(obj);
+      obj = next_obj;
+    }
+  }
+
+  free(mail);
+}
+
+int find_mail_by_id(long mail_id)
+{
+  int i;
+
+  for (i=0; i<=top_of_mail_table; i++)
+    if (mail_table[i].mail_id == mail_id)
+      return i;
+
+  /* Not found */
+  return NO_MAIL;
+}
+
+void copy_mail_index_entry(struct mail_index *to, struct mail_index *from)
+{
+//  to->mail_id   = from->mail_id;
+  to->recipient = from->recipient;
+  to->sender    = from->sender;
+  to->sent_time = from->sent_time;
+  to->flags     = from->flags;
+  if (from->subject)
+    to->subject   = strdup(from->subject);
+  else
+    to->subject   = NULL;
+}
+
+void copy_mail(struct mail_data *to, struct mail_data *from, int copy_mode)
+{
+  int i;
+  char new_subject[MAX_STRING_LENGTH];
+
+//  to->mail_id   = from->mail_id;
+  to->recipient = from->recipient;
+  to->sender    = from->sender;
+  to->sent_time = from->sent_time;
+
+  switch (copy_mode) {
+    case MAIL_COPY_NORMAL  : if (from->subject)
+                               sprintf(new_subject, "%s", from->subject);
+                             else
+                               *new_subject='\0';
+                             break;
+
+    case MAIL_COPY_FORWARD : if (from->subject)
+                               sprintf(new_subject, "FW: %s", from->subject);
+                             else
+                               sprintf(new_subject, "FW: - No Subject -");
+                             break;
+
+    case MAIL_COPY_REPLY   : if (from->subject)
+                               sprintf(new_subject, "RE: %s", from->subject);
+                             else
+                               sprintf(new_subject, "RE: - No Subject -");
+                             break;
+
+    default:                 log("Invalid copy mode passed to mail_copy.");
+                             *new_subject = '\0';
+                             break;
+  }
+
+  for (i=0; i<ML_ARRAY_MAX; i++)
+    to->mail_flags[i]     = from->mail_flags[i];
+
+  if (*new_subject)
+    to->subject   = strdup(new_subject);
+  else
+    to->subject   = NULL;
+
+  if (from->body)
+    to->body   = strdup(from->body);
+  else
+    to->body   = NULL;
+
+  /* Attachments cannot be copied */
+  to->attachment = NULL;
+  to->coins      = 0;
+}
+
+int create_mail_index_entry(struct mail_data *mail)
+{
+  int i, pos;
+
+  /* Is this mail already listed? */
+  if (mail->mail_id != NO_MAIL && find_mail_by_id(mail->mail_id) != NO_MAIL) {
+    log("SYSERR: create_mail_index_entry called for mail that already has an index entry (id=%ld)", mail->mail_id);
+    return NO_MAIL;
+  }
+
+  if (top_of_mail_table < 0) {	/* no table */
+    pos = top_of_mail_table = 0;
+    CREATE(mail_table, struct mail_index, 1);
+  } else {	/* add mail */
+    i = ++top_of_mail_table + 1;
+
+    RECREATE(mail_table, struct mail_index, i);
+    pos = top_of_mail_table;
+  }
+
+  /* Allocate a new ID number */
+  if ((mail_table[pos].mail_id = mail->mail_id = new_mail_id()) == NO_MAIL) {
+    log("SYSERR: Unable to allocate a unique mail ID for new mudmails");
+    return NO_MAIL;
+  }
+
+  /* copy subject and other vars */
+  if (mail->subject && *(mail->subject)) {
+    mail_table[pos].subject = strdup(mail->subject);
+  } else {
+    mail_table[pos].subject = NULL;
+  }
+  mail_table[pos].recipient = mail->recipient;
+  mail_table[pos].sender    = mail->sender;
+  mail_table[pos].sent_time = mail->sent_time;
+
+  /* clear the bitflag in case we have garbage data */
+  mail_table[pos].flags = 0;
+
+  /* set urgent or deleted flag if required, and flag if object or gold attached */
+  if (IS_SET_AR(mail->mail_flags, MAIL_URGENT))  SET_BIT(mail_table[pos].flags, MINDEX_URGENT);
+  if (IS_SET_AR(mail->mail_flags, MAIL_DELETED)) SET_BIT(mail_table[pos].flags, MINDEX_DELETED);
+  if (IS_SET_AR(mail->mail_flags, MAIL_COD))     SET_BIT(mail_table[pos].flags, MINDEX_IS_COD);
+  if (mail->attachment != NULL) SET_BIT(mail_table[pos].flags, MINDEX_HAS_OBJ);
+  if (mail->coins > 0)          SET_BIT(mail_table[pos].flags, MINDEX_HAS_GOLD);
+
+  return (pos);
+}
+
+bool delete_mail_index_entry(int mail_id)
+{
+  int i, found=0;
+  struct mail_index *temp_mail;
+  bool ret;
+
+  if (top_of_mail_table == -1 || mail_table == NULL) {	/* no table */
+    /* There is no table - this function shouldn't even have been called */
+    log("SYSERR: Attempt to delete mail id %d, but no mail index exists", mail_id);
+    return FALSE;
+  } else {	/* create a new smaller table */
+    CREATE(temp_mail, struct mail_index, top_of_mail_table);
+  }
+
+  /* Copy all index entries to new table */
+  for (i=0; i<=top_of_mail_table; i++) {
+    /* Is this the one to be removed? */
+    if (mail_table[i].mail_id == mail_id) {
+      /* Do not copy - just mark as 'found' */
+      found++;
+    } else {
+      /* Not the one to be removed - copy over the data */
+      copy_mail_index_entry(&(temp_mail[i-found]), &(mail_table[i]));
+    }
+  }
+  /* Freeing the index loses other vars, so back them up now */
+  i = top_of_mail_table - 1;
+  found = top_mail_idnum;
+
+  /* All done - free up the old index, and then set the new index as the current one */
+  free_mail_index();
+  mail_table = temp_mail;
+
+  /* Restore vars */
+  top_of_mail_table = i;
+  top_mail_idnum = found;
+
+  /* And save the new index */
+  ret = save_mail_index();
+
+  return ret;
+}
+
+/* This function necessary to save a seperate ASCII mail index */
+bool save_mail_index(void)
+{
+  int i;
+  char index_name[50], bits[64];
+  FILE *index_file;
+
+  sprintf(index_name, "%s%s", LIB_MLFILES, INDEX_FILE);
+  if (!(index_file = fopen(index_name, "w"))) {
+    log("SYSERR: Could not write mudmail index file (%s)", index_name);
+    return FALSE;
+  }
+
+  fprintf(index_file, "# tbaMUD mail index\n");
+  fprintf(index_file, "# Format: <ID> <flags> <sender ID/vnum> <recipient ID> <time> <subject>\n");
+  fprintf(index_file, "# For 'No Subject', use (null)\n");
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].subject && *mail_table[i].subject) {
+      sprintascii(bits, mail_table[i].flags);
+      fprintf(index_file, "%ld %s %ld %ld %ld %s\n", mail_table[i].mail_id, *bits ? bits : "0",
+      mail_table[i].sender, mail_table[i].recipient,
+      mail_table[i].sent_time, mail_table[i].subject);
+    } else {
+      sprintascii(bits, mail_table[i].flags);
+      fprintf(index_file, "%ld %s %ld %ld %ld (null)\n", mail_table[i].mail_id, *bits ? bits : "0",
+      mail_table[i].sender, mail_table[i].recipient,
+      mail_table[i].sent_time);
+    }
+  }
+  fprintf(index_file, "~\n");
+
+  fclose(index_file);
+
+  return TRUE;
+}
+
+int handle_mail_obj(struct obj_data *temp, struct mail_data *ml)
+{
+  if (!temp || !ml)  /* this should never happen, but.... */
+    return FALSE;
+
+  obj_to_mail(temp, ml);
+
+  return TRUE;
+}
+
+bool check_mail_dir(long mail_id)
+{
+#ifndef CIRCLE_UNIX
+#define stat _stat
+#endif
+  struct stat buffer;
+  char dirname[PATH_MAX];
+
+  sprintf(dirname, "%s%ld", LIB_MLFILES, (mail_id - (mail_id % 100))/100);  // 1234-> plrmail/12
+
+  if (stat(dirname, &buffer) == 0)
+  {
+#ifdef CIRCLE_UNIX
+    if (S_ISDIR(buffer.st_mode))
+#else
+    if (buffer.st_mode & _S_IFDIR)
+#endif
+      return TRUE;   // exists, and is a dir
+    else
+      return FALSE;  // exists, but not a dir!
+  }
+
+  if (errno == ENOENT)
+  {
+#ifdef CIRCLE_UNIX
+    if (mkdir(dirname, S_IRWXU) == 0)
+#else
+    if (_mkdir(dirname) == 0)
+#endif
+      return TRUE;
+
+    perror("Unable to create new directory");
+    return FALSE;
+  }
+  perror("Other problem with finding dir");
+  return FALSE;
+}
+#ifndef CIRCLE_UNIX
+#undefine stat
+#endif
+
+bool save_as_draft(struct char_data *ch, struct mail_data *ml)
+{
+  bool ret;
+
+  /* Set the draft flag, and other essential data */
+  SET_BIT_AR(ml->mail_flags, MAIL_DRAFT);
+  ml->sender = GET_ID(ch);
+
+  ret = save_mail(ml);
+
+  return ret;
+}
+
+bool save_mail(struct mail_data *ml)
+{
+  FILE *fl;
+  char fname[80], buf[MAX_STRING_LENGTH], bits[127], bits2[127], bits3[127], bits4[127];
+  long mail_id;
+  struct obj_data *obj, *next_obj;
+  bool index_change = FALSE;
+
+  /* Does this mail require a new ID, or is it re-saving an old one? */
+  if (ml->mail_id == NO_MAIL) {
+    /* Create an index entry and unique ID for this new mail */
+    if (create_mail_index_entry(ml) == NO_MAIL) {
+      log("SYSERR: Unable to save new mail in mail file: aborting!");
+      return FALSE;
+    }
+    index_change = TRUE;
+  }
+  mail_id = ml->mail_id;
+
+  if (!check_mail_dir(mail_id)) {
+    log("SYSERR: Unable to save mail (%ld) due to folder error: aborting!", mail_id);
+    /* Remove the index entry on failure */
+    if (index_change) delete_mail_index_entry(mail_id);
+    return FALSE;
+  }
+  /* Construct the filename */
+  snprintf(fname, sizeof(fname), "%s%ld%s%ld.%s", LIB_MLFILES, (mail_id - (mail_id % 100))/100, SLASH, mail_id, SUF_MAIL);
+
+  if (!(fl = fopen(fname, "w"))) {
+    mudlog(NRM, ADMLVL_GOD, TRUE, "SYSERR: Couldn't open mail file %s for write", fname);
+    /* Remove the index entry on failure */
+    if (index_change) delete_mail_index_entry(mail_id);
+    return FALSE;
+  }
+  /* Write tha actual data */
+  fprintf(fl, "MlID: %ld\n", ml->mail_id);
+  fprintf(fl, "Send: %ld\n", ml->sender);
+  fprintf(fl, "Reci: %ld\n", ml->recipient);
+  fprintf(fl, "Sent: %ld\n", ml->sent_time);
+  if (ml->subject && *ml->subject) {
+    strcpy(buf, ml->subject);
+    strip_cr(buf);
+    fprintf(fl, "Subj: %s\n", buf);
+  }
+  if (ml->body && *ml->body) {
+    strcpy(buf, ml->body);
+    fprintf(fl, "Body:\n%s~\n", buf);
+  }
+  fprintf(fl, "Gold: %d\n", (ml->coins > 0) ? ml->coins : 0);
+
+  sprintascii(bits,  ml->mail_flags[0]);
+  sprintascii(bits2, ml->mail_flags[1]);
+  sprintascii(bits3, ml->mail_flags[2]);
+  sprintascii(bits4, ml->mail_flags[3]);
+  fprintf(fl, "Flag: %s %s %s %s\n", bits, bits2, bits3, bits4);
+
+  /* Save all attached objects */
+  if (ml->attachment) {
+    obj = ml->attachment;
+    next_obj = obj->next_content;
+    fprintf(fl, "Objs:\n");
+    while (obj) {
+      if (!objsave_save_obj_record(obj, fl, 0)) {
+        log("SYSERR: Unable to save attachments for mail %ld", mail_id);
+      }
+      /* No need to extract_obj(obj); - the save function should have already done it */
+      obj = next_obj;
+    }
+  }
+  /* EOF */
+  fprintf(fl, "$~\n");
+
+  fclose(fl);
+
+  if (index_change) save_mail_index();
+
+  return TRUE;
+}
+
+bool load_mail(long mail_id, struct mail_data *ml)
+{
+  FILE *fl;
+  char fname[80], buf[MAX_STRING_LENGTH], line[MAX_INPUT_LENGTH + 1], tag[6];
+  char f1[128], f2[128], f3[128], f4[128];
+  obj_save_data *loaded, *current;
+  int num_objs=0;
+
+  /* Create an index entry and unique ID for this new mail */
+  if (find_mail_by_id(mail_id) == NO_MAIL) {
+    log("SYSERR: Unable to load mail from file: invalid ID (%ld)", mail_id);
+    return FALSE;
+  }
+
+  if (!check_mail_dir(mail_id)) {
+    log("SYSERR: Unable to load mail (%ld) due to folder error: aborting!", mail_id);
+    return FALSE;
+  }
+  /* Construct the filename */
+  snprintf(fname, sizeof(fname), "%s%ld%s%ld.%s", LIB_MLFILES, (mail_id - (mail_id % 100))/100, SLASH, mail_id, SUF_MAIL);
+
+  if (!(fl = fopen(fname, "r"))) {
+    mudlog(NRM, ADMLVL_GOD, TRUE, "SYSERR: Couldn't open mail file %s for reading.", fname);
+    return FALSE;
+  }
+
+  while (get_line(fl, line)) {
+    tag_argument(line, tag);
+    switch (*tag) {
+      case 'A':
+              if (!strcmp(tag, "Atta"))	{
+                loaded = objsave_parse_objects(fl);
+                for (current = loaded; current != NULL; current=current->next)
+                  num_objs += handle_mail_obj(current->obj, ml);
+			  }
+         break;
+      case 'B':
+              if (!strcmp(tag, "Body"))	ml->body = fread_string(fl, buf);
+         break;
+      case 'F':
+              if (!strcmp(tag, "Flag")) {
+                if (sscanf(line, "%s %s %s %s", f1, f2, f3, f4) == 4) {
+                  ml->mail_flags[0] = asciiflag_conv(f1);
+                  ml->mail_flags[1] = asciiflag_conv(f2);
+                  ml->mail_flags[2] = asciiflag_conv(f3);
+                  ml->mail_flags[3] = asciiflag_conv(f4);
+                } else
+                  log("SYSERR: Invalid mail flags in file %s", fname);
+                }
+
+         break;
+      case 'G':
+              if (!strcmp(tag, "Gold"))	ml->coins = atoi(line);
+         break;
+      case 'M':
+              if (!strcmp(tag, "MlID"))	ml->mail_id = atol(line);
+         break;
+      case 'R':
+              if (!strcmp(tag, "Reci"))	ml->recipient = atol(line);
+         break;
+      case 'S':
+              if (!strcmp(tag, "Send"))	ml->sender    = atol(line);
+         else if (!strcmp(tag, "Sent"))	ml->sent_time = atol(line);
+         else if (!strcmp(tag, "Subj"))	{
+           if (!*line || !strcmp(line, "(null)"))
+             ml->subject = NULL;
+           else
+             ml->subject = strdup(line);
+         }
+         break;
+      default:
+        sprintf(buf, "SYSERR: Unknown tag %s in mail file %s", tag, fname);
+    }
+  }
+  fclose(fl);
+  return TRUE;
+}
+
+/* Draft timeout should be called hourly from 'heartbeat' */
+void draft_timeout(void)
+{
+  int i, hours;
+
+  if (CONFIG_DRAFT_TIMEOUT == 0) /* No Timeout! */
+    return;
+
+  /* Go through all mails, checking the date */
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (IS_MAIL_DRAFT(i)) {
+      hours = (time(0) - mail_table[i].sent_time) / 3600;  /* How many hours ago */
+      /* Has this mail timed out? */
+      if (hours > CONFIG_DRAFT_TIMEOUT * 24) {
+        delete_mail_index_entry(mail_table[i].mail_id);
+      }
+    }
+  }
+}
+
+bool mail_recip_ok(const char *name)
+{
+  int player_i;
+  bool ret = FALSE;
+
+  if ((player_i = get_ptable_by_name(name)) >= 0) {
+    if (!IS_SET(player_table[player_i].flags, PINDEX_DELETED))
+      ret = TRUE;
+  }
+  return ret;
+}
+
+struct char_data *find_mailman(struct char_data *ch)
+{
+  struct char_data *mob;
+  for (mob=world[IN_ROOM(ch)].people; mob; mob = mob->next_in_room)
+    if (IS_NPC(mob) && MOB_FLAGGED(mob, MOB_MAILMAN))
+      return mob;
+
+  return NULL;
+}
+
+struct char_data *find_immortal_mailman(void)
+{
+  int r_room;
+  struct char_data *mob;
+
+  if ((r_room = real_room(MAIL_IMMORTAL_ROOM)) == NOWHERE) return NULL;
+
+  for (mob=world[r_room].people; mob; mob = mob->next_in_room)
+    if (IS_NPC(mob) && MOB_FLAGGED(mob, MOB_MAILMAN))
+      return mob;
+
+  return NULL;
+}
+
+int show_inbox_to_char(struct char_data *ch)
+{
+  int i, j, count=0, unread=0;
+  char subj[45], d_t[22], sender[MAX_NAME_LENGTH+1], buf[MAX_STRING_LENGTH], line_color[3];
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].recipient == GET_ID(ch) && !IS_MAIL_DRAFT(i)) {
+      /* Show header if this is the first item */
+      if (!count) {
+        send_to_char(ch, "%stbaMUD Mail System                                                        %sInbox%s\r\n", QBYEL, QBWHT, QNRM);
+        send_to_char(ch, "%sFlags Num From               Date/Time              Subject%s\r\n", QYEL, QNRM);
+      }
+
+      /* Set up the 'subject' string */
+      if (mail_table[i].subject && *(mail_table[i].subject)) {
+        /* Copy the subject string */
+        for (j=0; j<41 && mail_table[i].subject[j]; j++)
+          subj[j] = mail_table[i].subject[j];
+        subj[j] = '\0';
+        /* If we didn't reach the end of the 'subject', add "..." */
+        if (j==41) {
+          for (j=0; j<3; j++) subj[j+41] = '.';
+          subj[j+41] = '\0';
+        }
+      } else {
+        sprintf(subj, "- No Subject -");
+      }
+
+      /* Set up the date/time string */
+      strlcpy(buf, (char *) asctime(localtime(&(mail_table[i].sent_time))), sizeof(buf));
+      snprintf(d_t, 11, "%s", buf);       /* Start of 'date' - Fri Feb 10 */
+      snprintf(d_t+10, 6, " %s", buf+20); /* Add the year    - 2008       */
+      snprintf(d_t+15, 7, " %s", buf+11); /* Add the 'time'  - 17:56      */
+
+      /* Set up the sender string */
+      if (get_sender_name_by_id(mail_table[i].mail_id) != NULL) {
+        sprintf(sender, "%s", get_sender_name_by_id(mail_table[i].mail_id));
+      } else {
+        sprintf(sender, "Unknown!");
+      }
+
+      /* Truncate sender name if over 18 chars */
+      if (strlen(sender) > 18)
+      {
+        strcpy(sender+15, "...");
+      }
+
+      /* Set up the 'line color' */
+      if (IS_MAIL_READ(i)) {
+             if (IS_MAIL_DELETED(i)) sprintf(line_color, "@D");
+        else if (IS_MAIL_URGENT(i))  sprintf(line_color, "@r");
+        else                         sprintf(line_color, "@g");
+      } else {
+        unread++;
+             if (IS_MAIL_DELETED(i)) sprintf(line_color, "@D");
+        else if (IS_MAIL_URGENT(i))  sprintf(line_color, "@R");
+        else                         sprintf(line_color, "@G");
+      }
+
+      /* Show this line */
+      send_to_char(ch, "%s%s%s%s%s %s%-3d %s%-18s%s %-22s %-44s%s\r\n",
+                                 IS_MAIL_READ(i) ? " " : "@G*",
+                                 IS_MAIL_URGENT(i) ? "@R!" : " ",
+                                 MAIL_HAS_GOLD(i) ? (IS_MAIL_COD(i) ? "@Y-" : "@Y+") : " ",
+                                 MAIL_HAS_OBJECT(i) ? "@WO" : " ",
+                                 IS_MAIL_DELETED(i) ? "@DX" : " ",
+                                 line_color, ++count,
+                                 IS_SET(mail_table[i].flags, MINDEX_FROM_MOB) ? "@y" : "", sender, line_color,
+                                 d_t, subj, QNRM);
+    }
+  }
+  if (count) {
+    send_to_char(ch, "%s%d%s mudmails in your inbox\r\n", QYEL, count, QNRM);
+    if (unread) send_to_char(ch, "%s%d%s unread mudmails\r\n", QYEL, unread, QNRM);
+  }
+  else
+    send_to_char(ch, "Your inbox is currently empty!\r\n");
+  return(count);
+}
+
+int mail_list_to_admin(struct char_data *ch)
+{
+  int i, j, count=0, unread=0;
+  char subj[45], d_t[22], sender[MAX_NAME_LENGTH+1], recip[MAX_NAME_LENGTH+1], buf[MAX_STRING_LENGTH], line_color[3];
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (!IS_MAIL_DRAFT(i)) {
+      /* Show header if this is the first item */
+      if (!count) {
+        send_to_char(ch, "%stbaMUD Mail System                                                        %sInbox%s\r\n", QBYEL, QBWHT, QNRM);
+        send_to_char(ch, "%sFlags Num From               To                 Date/Time              Subject%s\r\n", QYEL, QNRM);
+      }
+
+      /* Set up the 'subject' string */
+      if (mail_table[i].subject && *(mail_table[i].subject)) {
+        /* Copy the subject string */
+        for (j=0; j<41 && mail_table[i].subject[j]; j++)
+          subj[j] = mail_table[i].subject[j];
+        subj[j] = '\0';
+        /* If we didn't reach the end of the 'subject', add "..." */
+        if (j==41) {
+          for (j=0; j<3; j++) subj[j+41] = '.';
+          subj[j+41] = '\0';
+        }
+      } else {
+        sprintf(subj, "- No Subject -");
+      }
+
+      /* Set up the date/time string */
+      strlcpy(buf, (char *) asctime(localtime(&(mail_table[i].sent_time))), sizeof(buf));
+      snprintf(d_t, 11, "%s", buf);       /* Start of 'date' - Fri Feb 10 */
+      snprintf(d_t+10, 6, " %s", buf+20); /* Add the year    - 2008       */
+      snprintf(d_t+15, 7, " %s", buf+11); /* Add the 'time'  - 17:56      */
+
+      /* Set up the sender string */
+      sprintf(sender, "%s", get_sender_name_by_id(mail_table[i].mail_id));
+
+      /* Truncate sender name if over 18 chars */
+      if (strlen(sender) > 18)
+      {
+        strcpy(sender+15, "...");
+      }
+
+      /* Set up the recipient string */
+      sprintf(recip, "%s", get_recipient_name_by_id(mail_table[i].mail_id));
+
+      /* Truncate sender name if over 18 chars */
+      if (strlen(recip) > 18)
+      {
+        strcpy(recip+15, "...");
+      }
+      /* Set up the 'line color' */
+      if (IS_MAIL_READ(i)) {
+             if (IS_MAIL_DELETED(i)) sprintf(line_color, "@D");
+        else if (IS_MAIL_URGENT(i))  sprintf(line_color, "@r");
+        else                         sprintf(line_color, "@g");
+      } else {
+        unread++;
+             if (IS_MAIL_DELETED(i)) sprintf(line_color, "@D");
+        else if (IS_MAIL_URGENT(i))  sprintf(line_color, "@R");
+        else                         sprintf(line_color, "@G");
+      }
+      send_to_char(ch, "%s%s%s%s%s %s%-3d %s%-18s%s %s%18s%s %-22s %-44s%s\r\n",
+                                 IS_MAIL_READ(i) ? " " : "@G*",
+                                 IS_MAIL_URGENT(i) ? "@R!" : " ",
+                                 MAIL_HAS_GOLD(i) ? (IS_MAIL_COD(i) ? "@Y-" : "@Y+") : " ",
+                                 MAIL_HAS_OBJECT(i) ? "@WO" : " ",
+                                 IS_MAIL_DELETED(i) ? "@DX" : " ",
+                                 line_color, ++count,
+                                 IS_SET(mail_table[i].flags, MINDEX_FROM_MOB) ? "@y" : "", sender, line_color,
+                                 ((!*recip) || (!strcmp(recip,"(null)"))) ? "@D" : "", recip, line_color,
+                                 d_t, subj, QNRM);
+    }
+  }
+  if (count) {
+    send_to_char(ch, "There are %s%d%s mudmails in the system\r\n", QYEL, count, QNRM);
+    if (unread) send_to_char(ch, "%s%d%s are unread mudmails\r\n", QYEL, unread, QNRM);
+  }
+  else
+    send_to_char(ch, "The mail system is currently empty!\r\n");
+  return(count);
+}
+
+int show_outbox_to_char(struct char_data *ch)
+{
+  int i, j, count=0;
+  char subj[45], d_t[22], recipient[MAX_NAME_LENGTH+1], buf[MAX_STRING_LENGTH], line_color[3];
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].sender == GET_ID(ch) && IS_MAIL_DRAFT(i)) {
+      /* Show header if this is the first item */
+      if (!count) {
+        send_to_char(ch, "%stbaMUD Mail System                                                       %sOutbox%s\r\n", QBYEL, QBWHT, QNRM);
+        send_to_char(ch, "%sFlags Num To                 Date/Time              Subject%s\r\n", QYEL, QNRM);
+      }
+
+      /* Set up the 'subject' string */
+      if (mail_table[i].subject && *(mail_table[i].subject)) {
+        /* Copy the subject string */
+        for (j=0; j<41 && mail_table[i].subject[j]; j++)
+          subj[j] = mail_table[i].subject[j];
+        subj[j] = '\0';
+        /* If we didn't reach the end of the 'subject', add "..." */
+        if (j==41) {
+          for (j=0; j<3; j++) subj[j+41] = '.';
+          subj[j+41] = '\0';
+        }
+      } else {
+        sprintf(subj, "- No Subject -");
+      }
+
+      /* Set up the date/time string */
+      strlcpy(buf, (char *) asctime(localtime(&(mail_table[i].sent_time))), sizeof(buf));
+      snprintf(d_t, 11, "%s", buf);       /* Start of 'date' - Fri Feb 10 */
+      snprintf(d_t+10, 6, " %s", buf+20); /* Add the year    - 2008       */
+      snprintf(d_t+15, 7, " %s", buf+11); /* Add the 'time'  - 17:56      */
+
+      /* Set up the sender string */
+      if (mail_table[i].recipient > 0 && mail_table[i].recipient != NOBODY)
+        sprintf(recipient, "%s", get_name_by_id(mail_table[i].recipient));
+      else
+        sprintf(recipient, "<Nobody>");
+
+      /* Truncate sender name if over 18 chars */
+      if (strlen(recipient) > 18)
+      {
+        strcpy(recipient+15, "...");
+      }
+
+      /* Set up the 'line color' */
+             if (IS_MAIL_DELETED(i)) sprintf(line_color, "@D");
+        else if (IS_MAIL_URGENT(i))  sprintf(line_color, "@r");
+        else                         sprintf(line_color, "@g");
+
+      /* Show this line */
+      send_to_char(ch, "%s%s%s%s%s %s%-3d %s%-18s%s %-22s %-44s%s\r\n",
+                                 IS_MAIL_READ(i) ? " " : "@G*",
+                                 IS_MAIL_URGENT(i) ? "@R!" : " ",
+                                 MAIL_HAS_GOLD(i) ? (IS_MAIL_COD(i) ? "@Y-" : "@Y+") : " ",
+                                 MAIL_HAS_OBJECT(i) ? "@WO" : " ",
+                                 IS_MAIL_DELETED(i) ? "@DX" : " ",
+                                 line_color, ++count,
+                                 IS_SET(mail_table[i].flags, MINDEX_FROM_MOB) ? "@y" : "", recipient, line_color,
+                                 d_t, subj, QNRM);
+    }
+  }
+  if (count) {
+    send_to_char(ch, "%s%d%s unsent mudmails in your outbox\r\n", QYEL, count, QNRM);
+  }
+  else
+    send_to_char(ch, "Your outbox is currently empty!\r\n");
+  return(count);
+}
+
+void give_mail_attachments(struct char_data *ch, struct mail_data *ml)
+{
+  struct obj_data *obj;
+
+  /* First, do the object attachments */
+  while (ml->attachment) {
+    obj = ml->attachment;
+    obj_from_mail(obj);
+    obj_to_char(obj, ch);
+  }
+
+  /* Then the gold */
+  if (ml->coins)
+    GET_GOLD(ch) += ml->coins;
+}
+
+int count_recipients(struct mail_edit_data *ml_list)
+{
+  int count = 0;
+  struct recipient_list *this;
+
+  this = ml_list->recipients;
+  while (this) {
+    count++;
+    this = this->next;
+  }
+  return count;
+}
+
+void clear_mail_data(struct mail_data *ml)
+{
+  int i=0;
+
+  ml->mail_id    = NO_MAIL;
+  ml->sender     = NOBODY;
+  ml->recipient  = NOBODY;
+  ml->subject    = NULL;
+  ml->body       = NULL;
+  ml->attachment = NULL;
+  ml->sent_time  = time(0);
+  ml->coins      = 0;
+
+  for (i=0; i<ML_ARRAY_MAX; i++)
+    (ml->mail_flags[(i)]) = 0;
+}
+
+int purge_marked_mail(struct char_data *ch)
+{
+  bool found;
+  int i, count = 0;
+
+  do
+  {
+    found = FALSE;
+    for (i = 0; i <= top_of_mail_table && !found; i++) {
+      if (mail_table[i].recipient == GET_ID(ch) && (IS_MAIL_DELETED(i))) {
+        /* Remove the index entry - the mail file is never removed, but may get overwritten eventually */
+        delete_mail_index_entry(mail_table[i].mail_id);
+        /* Set the flag, to cause the search to restart, as the list has changed */
+        found = TRUE;
+        count++;
+      }
+    }
+  } while (found == TRUE);
+
+  return count;
+}
+
+struct mail_data *create_mail(void)
+{
+  struct mail_data *this_mail;
+
+  CREATE(this_mail, struct mail_data, 1);
+
+  if (!this_mail) return NULL;
+
+  clear_mail_data(this_mail);
+
+  return this_mail;
+}
+
+bool add_recipient(struct mail_edit_data *ml, long player_id)
+{
+  struct recipient_list *this;
+
+  CREATE(this, struct recipient_list, 1);
+
+  if (!this) return FALSE;
+
+  this->recipient = player_id;
+  this->next      = ml->recipients;
+  ml->recipients  = this;
+
+  return TRUE;
+}
+
+bool remove_recipient(struct mail_edit_data *ml, long player_id)
+{
+  struct recipient_list *this, *del;
+
+  this = ml->recipients;
+
+  if (!this) return FALSE;
+
+  if (this->recipient == player_id) {
+    ml->recipients = this->next;
+    this->next = NULL;
+    free(this);
+    return TRUE;
+  } else {
+    while (this && this->next) {
+      if ((this->next)->recipient == player_id) {
+        del = this->next;
+        this->next = del->next;
+        del->next = NULL;
+        free(del);
+        return TRUE;
+      }
+	}
+  }
+  return FALSE;
+}
+
+void clear_recipients(struct mail_edit_data *ml)
+{
+  struct recipient_list *del;
+
+  while (ml->recipients) {
+    del = ml->recipients;
+    ml->recipients = (ml->recipients)->next;
+    del->next = NULL;
+    free(del);
+  }
+}
+
+char *recipient_list(struct mail_edit_data *ml)
+{
+  struct recipient_list *this;
+  static char name_list[MAX_STRING_LENGTH];
+  char this_name[MAX_NAME_LENGTH+1];
+  int grp;
+
+  if (!(ml->recipients)) return NULL;
+
+  *name_list = '\0';
+  this = ml->recipients;
+  while (this) {
+    if (this->recipient < MAIL_TO_NOBODY) {
+      for (grp=0; mail_groups[grp].recipient != MAIL_TO_NOBODY; grp++) {
+        if (mail_groups[grp].recipient == this->recipient) {
+          sprintf(this_name, "%s", mail_groups[grp].name);
+          sprintf(name_list, "%s @Y%s@y", name_list, CAP(this_name));
+		}
+      }
+    } else {
+      /* Set up the sender string */
+      if (this->recipient > 0 && this->recipient != NOBODY)
+        sprintf(this_name, "%s", get_name_by_id(this->recipient));
+      else
+        sprintf(this_name, "<Nobody>");
+
+      sprintf(name_list, "%s %s", name_list, CAP(this_name));
+    }
+    this = this->next;
+  }
+  return name_list;
+}
+
+long get_mail_group_by_name(char *name)
+{
+  int grp;
+
+  for (grp=0; mail_groups[grp].recipient != MAIL_TO_NOBODY; grp++)
+    if (!strcmp(mail_groups[grp].name, name))
+      return (mail_groups[grp].recipient);
+
+   return MAIL_TO_NOBODY;
+}
+
+void list_attachments_numbered(struct obj_data *list, struct char_data *ch)
+{
+  struct obj_data *i, *j;
+  bool found;
+  int num, line=0;
+
+  found = FALSE;
+
+  for (i = list; i; i = i->next_content) {
+    num = 0;
+    for (j = list; j != i; j = j->next_content)
+      if (!strcmp(j->short_description, i->short_description) && (!strcmp(j->name, i->name)))
+      break;
+    if (j != i)
+      continue;
+    for (j = i; j; j = j->next_content)
+      if (!strcmp(j->short_description, i->short_description) && (!strcmp(j->name, i->name)))
+        num++;
+    if (CAN_SEE_OBJ(ch, i) && (*i->description != '.' || (IS_NPC(ch) || PRF_FLAGGED(ch, PRF_HOLYLIGHT)))) {
+      if (num != 1)
+        send_to_char(ch, "%d) (%2d) ", ++line, num);
+      show_obj_to_char(i, ch, 1);  /* 1 is SHOW_OBJ_SHORT, defined in act.informative.c */
+      send_to_char(ch, "%s", CCNRM(ch, C_NRM));
+      found = TRUE;
+    }
+  }
+  if (!found)
+    send_to_char(ch, "  Nothing.\r\n");
+}
+
+struct obj_data *get_attachment_numbered(struct char_data *ch, struct obj_data *list, int find_num)
+{
+  struct obj_data *i, *j;
+  int num, line=0;
+
+  for (i = list; i; i = i->next_content) {
+    num = 0;
+    for (j = list; j != i; j = j->next_content)
+      if (!strcmp(j->short_description, i->short_description) && (!strcmp(j->name, i->name)))
+      break;
+    if (j != i)
+      continue;
+    for (j = i; j; j = j->next_content)
+      if (!strcmp(j->short_description, i->short_description) && (!strcmp(j->name, i->name)))
+        num++;
+    if (CAN_SEE_OBJ(ch, i) && (*i->description != '.' || (IS_NPC(ch) || PRF_FLAGGED(ch, PRF_HOLYLIGHT)))) {
+      if (++line == find_num)
+       return(i);
+    }
+  }
+  return NULL;
+}
+
+bool mail_from_player(long to, long from, char *message_pointer)
+{
+  struct mail_data *this_mail;
+
+  if ((this_mail = create_mail()) == NULL) {
+    log("SYSERR: Unable to create new mail structure in mail_from_player");
+    return FALSE;
+  }
+
+  this_mail->recipient = to;
+  this_mail->sender = from;
+  this_mail->body = message_pointer;
+
+  if (create_mail_index_entry(this_mail) != -1) {
+    if (!save_mail(this_mail)) {
+      log("SYSERR: Unable to save new mail from %s to %s", get_name_by_id(from), get_name_by_id(to));
+      this_mail->body = NULL;
+      extract_mail(this_mail); /* don't free the body */
+      return FALSE;
+    }
+  } else
+    log("SYSERR: Unable to create new mail from %s to %s", get_name_by_id(from), get_name_by_id(to));
+
+  this_mail->body = NULL;
+  extract_mail(this_mail); /* don't free the body */
+  return TRUE;
+}
+
+bool mail_from_mobile(struct char_data *mob)
+{
+  struct mail_edit_data *this_mail;
+  struct mail_data *ml;
+
+  if (!IS_NPC(mob)) {
+    log("SYSERR: PC calling mail_from_mobile");
+    return FALSE;
+  }
+  this_mail = MOB_MAIL(mob);
+
+  if (this_mail->recipients == NULL) {
+    log("SYSERR: mail_from_mobile called with no recipients (%s)", GET_NAME(mob));
+    return FALSE;
+  }
+  if ((this_mail->mail)->body == NULL) {
+    log("SYSERR: mail_from_mobile called with blank message (%s)", GET_NAME(mob));
+    return FALSE;
+  }
+
+  ml = this_mail->mail;
+
+  ml->mail_id = NO_MAIL;
+  ml->sender  = GET_MOB_VNUM(mob);
+  SET_BIT_AR(ml->mail_flags, MAIL_FROM_MOB);
+
+  if (perform_mob_send_edited(mob) == FALSE) {
+    log("SYSERR: Unable to create new mail from %s (mob)", GET_NAME(mob));
+    return FALSE;
+  }
+  return TRUE;
+}
+
+void make_cod_payment_mail(struct mail_data *orig)
+{
+  struct mail_data *this_mail;
+  char buf[MAX_STRING_LENGTH];
+
+  /* Mobs can't get mails, so don't send a reply */
+  if (IS_SET_AR(orig->mail_flags, MAIL_FROM_MOB)) return;
+
+  /* If no coins requested, then don't make a COD mail */
+  if (!IS_SET_AR(orig->mail_flags, MAIL_COD) || orig->coins <= 0) return;
+
+
+  this_mail = create_mail();
+  if (this_mail) {
+    sprintf(buf, "Automatically generated COD payment mail from @c%s@n.\r\n"
+                 "Attached are @y%d@n coins.\r\n"
+                 "'receive' this mail to get it's attached gold.\r\n", get_name_by_id(orig->recipient), orig->coins);
+    this_mail->recipient = orig->sender;
+    this_mail->sender = orig->recipient;
+    this_mail->subject = strdup("- COD Payment -");
+    this_mail->body = strdup(buf);
+    this_mail->coins = orig->coins;
+
+    if (create_mail_index_entry(this_mail) != -1)
+      save_mail(this_mail);
+    else {
+      log("SYSERR: Unable to create COD reply (%d coins) from %s to %s", this_mail->coins,
+                                                                         get_name_by_id(this_mail->sender),
+                                                                         get_name_by_id(this_mail->recipient));
+    }
+    extract_mail(this_mail); /* Free the body and subject*/
+  }
+}
+bool perform_send_to_groups(struct char_data *ch, struct mail_edit_data *ml_list)
+{
+  int i, j;
+  struct mail_data *ml;
+  struct recipient_list *this;
+  bool do_this, ret = FALSE, to_who[NUM_MAIL_GROUPS+1];
+
+  if (!ml_list || (ml = ml_list->mail) == NULL) {
+    log("SYSERR: perform_send_to_groups (mail.c): mail data is empty. Aborting!");
+    return FALSE;
+  }
+
+  /* Set flags for groups */
+  for (i=0; i<=NUM_MAIL_GROUPS; i++) to_who[i] = FALSE;
+  for (this=ml_list->recipients; this; this = this->next) {
+    for (i=0; i<=NUM_MAIL_GROUPS; i++) {
+      if (this->recipient == mail_groups[i].recipient) {
+        to_who[i] = TRUE;
+      }
+    }
+  }
+
+  /* Now remove the groups from the recipient list */
+  for (i=0; i<=NUM_MAIL_GROUPS; i++) {
+    if (to_who[i] == TRUE)
+      remove_recipient(ml_list, mail_groups[i].recipient);
+  }
+
+  for (i=0; i<=top_of_p_table; i++) {
+	do_this = FALSE;
+    for (j=0; j<=NUM_MAIL_GROUPS; j++) {
+      if (to_who[j] == TRUE) {
+        if (mail_groups[j].recipient == MAIL_TO_ALL)  do_this = TRUE;
+        if (mail_groups[j].recipient == MAIL_TO_IMMS && player_table[i].level >= ADMLVL_IMMORT) do_this = TRUE;
+	  }
+    }
+    /* Do we need to send to this player? */
+    if (do_this) {
+      ml->recipient = player_table[i].id;   /* Set the recipient for this mail */
+      save_mail(ml);                        /* 'send' the mail by saving it    */
+      notify_if_playing(ch, ml->recipient); /* Let the recipient know          */
+      ml->mail_id = NO_MAIL;                /* remove the unique ID created when saving */
+      ret = TRUE;
+    }
+  }
+
+  return ret;
+}
+
+bool perform_send_edited(struct char_data *ch, struct mail_edit_data *ml_list)
+{
+  struct mail_data *ml;
+  struct recipient_list *this;
+  long old_id = NO_MAIL;
+
+  if (!ch || IS_NPC(ch)) {
+    log("SYSERR: perform_send_edited (mail.c): Invalid character");
+    send_to_char(ch, "Your mail could not be sent!\r\n");
+    return FALSE;
+  }
+
+  if (!ml_list || ((this = ml_list->recipients) == NULL)) {
+    log("SYSERR: perform_send_edited (mail.c): recipient list is empty. Aborting!");
+    send_to_char(ch, "Your mail could not be sent!\r\n");
+    return FALSE;
+  }
+
+  if ((ml = ml_list->mail) == NULL) {
+    log("SYSERR: perform_send_edited (mail.c): mail data is empty. Aborting!");
+    send_to_char(ch, "Your mail could not be sent!\r\n");
+    return FALSE;
+  }
+
+  if ((count_recipients(ml_list) > 1) && (ml->coins || ml->attachment)) {
+    log("SYSERR: perform_send_edited (mail.c): mail to multiple recipients cannot have attachments or gold.");
+    give_mail_attachments(ch, ml);
+    send_to_char(ch, "Your mail could not be sent!\r\n");
+    return FALSE;
+  }
+
+  if (ml->mail_id != NO_MAIL && IS_SET_AR(ml->mail_flags, MAIL_DRAFT))
+    old_id = ml->mail_id;
+
+  /* First, check for 'mail groups' and send to them */
+  perform_send_to_groups(ch, ml_list);
+
+  /* Cycle through remaining recipients sending to each one */
+  while(this) {
+    ml->recipient = this->recipient;      /* Set the recipient for this mail */
+    save_mail(ml);                        /* 'send' the mail by saving it    */
+    notify_if_playing(ch, ml->recipient); /* Let the recipient know          */
+    ml->mail_id = NO_MAIL;                /* remove the unique ID created when saving */
+    this = this->next;                    /* move to the next recipient      */
+  }
+
+  /* Was this a draft copy that has been sent, if so, the old draft can be removed */
+  if (old_id != NO_MAIL)
+    delete_mail_index_entry(old_id);
+
+  send_to_char(ch, "Mail sent!\r\n");
+  return TRUE;
+}
+
+bool perform_mob_send_edited(struct char_data *mob)
+{
+  struct mail_data *ml;
+  struct mail_edit_data *ml_list;
+  struct recipient_list *this;
+
+  if (!mob || !IS_NPC(mob)) {
+    log("SYSERR: perform_mob_send_edited (mail.c): Invalid character");
+    mob_log(mob, "Invalid mobile for sending mail from");
+    send_to_char(mob, "Mob mail could not be sent!  See syslog!\r\n");
+    return FALSE;
+  }
+
+  ml_list = MOB_MAIL(mob);
+
+  if (!ml_list || ((this = ml_list->recipients) == NULL)) {
+    log("SYSERR: perform_mob_send_edited (mail.c): recipient list is empty. Aborting!");
+    mob_log(mob, "mail recipient list is empty. Aborting!");
+    send_to_char(mob, "Mob mail could not be sent!  See syslog!\r\n");
+    return FALSE;
+  }
+
+  if ((ml = ml_list->mail) == NULL) {
+    log("SYSERR: perform_mob_send_edited (mail.c): mail data is empty. Aborting!");
+    mob_log(mob, "internal mail structure problem");
+    send_to_char(mob, "Mob mail could not be sent!  See syslog!\r\n");
+    return FALSE;
+  }
+
+  if ((count_recipients(ml_list) > 1) && (ml->coins || ml->attachment)) {
+    log("SYSERR: perform_mob_send_edited (mail.c): mail to multiple recipients cannot have attachments or gold.");
+    mob_log(mob, "multiple recipients in mail with attachments");
+    give_mail_attachments(mob, ml);
+    send_to_char(mob, "Mob mail could not be sent!  See syslog!\r\n");
+    return FALSE;
+  }
+
+  /* First, check for 'mail groups' and send to them */
+  perform_send_to_groups(mob, ml_list);
+
+  /* Cycle through remaining recipients sending to each one */
+  while(this) {
+    ml->recipient = this->recipient;      /* Set the recipient for this mail */
+    save_mail(ml);                        /* 'send' the mail by saving it    */
+    notify_if_playing(mob, ml->recipient); /* Let the recipient know          */
+    ml->mail_id = NO_MAIL;                /* remove the unique ID created when saving */
+    this = this->next;                    /* move to the next recipient      */
+  }
+
+  send_to_char(mob, "Mail sent!\r\n");
+
+  /* Now erase the  mail info */
+  clear_recipients(MOB_MAIL(mob));
+  extract_mail(MOB_MAIL(mob)->mail);
+  MOB_MAIL(mob)->mail = NULL;
+
+  return TRUE;
+}
+
+void create_mob_mail(struct char_data *mob)
+{
+  struct mail_data *ml;
+  struct mail_edit_data *ml_list;
+
+  if (!MOB_MAIL(mob)) {
+    CREATE(ml_list, struct mail_edit_data, 1);
+    MOB_MAIL(mob) = ml_list;
+    MOB_MAIL(mob)->mail       = NULL;
+    MOB_MAIL(mob)->recipients = NULL;
+  }
+
+  if (!(MOB_MAIL(mob)->mail)) {
+    ml = create_mail();
+    MOB_MAIL(mob)->mail = ml;
+  }
+
+  (MOB_MAIL(mob)->mail)->sender = GET_MOB_VNUM(mob);
+  SET_BIT_AR((MOB_MAIL(mob)->mail)->mail_flags, MAIL_FROM_MOB);
+}
+
+bool has_mail(struct char_data *ch)
+{
+  int i;
+
+  for (i = 0; i <= top_of_mail_table; i++)
+    if (mail_table[i].recipient == GET_ID(ch) && !(IS_MAIL_DELETED(i)) &&
+                                                 !(IS_MAIL_DRAFT(i)) &&
+                                                 !(IS_MAIL_READ(i)) )
+      return TRUE;
+
+  return FALSE;
+}
+
+int count_deleted(struct char_data *ch)
+{
+  int i, count=0;
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].recipient == GET_ID(ch) && (IS_MAIL_DELETED(i)) &&
+                                                 !(IS_MAIL_DRAFT(i)) )
+      count++;
+    else if (mail_table[i].sender == GET_ID(ch) && (IS_MAIL_DELETED(i)) &&
+                                              (IS_MAIL_DRAFT(i)) )
+      count++;
+  }
+  return count;
+}
+
+void notify_if_playing(struct char_data *from, int recipient_id)
+{
+  struct descriptor_data *d;
+
+  for (d = descriptor_list; d; d = d->next)
+    if ((IS_PLAYING(d)) && (GET_IDNUM(d->character) == recipient_id) && (has_mail(d->character)))
+      send_to_char(d->character, "You have new mudmail from %s.\r\n", GET_NAME(from));
+}
+
+void notify_on_login(struct char_data *ch)
+{
+  int count=0, urgent=0, i;
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].recipient == GET_ID(ch) && !(IS_MAIL_DELETED(i)) &&
+                                                 !(IS_MAIL_DRAFT(i)) &&
+                                                 !(IS_MAIL_READ(i)) ) {
+      count++;
+      if (IS_MAIL_URGENT(i)) urgent++;
+    }
+  }
+  if (count)
+    send_to_char(ch, "You have %d new mudmail%s in your inbox.\r\n", count, count > 1 ? "s" : "");
+  if (urgent)
+    send_to_char(ch, "%d of these %s urgent.\r\n", urgent, urgent > 1 ? "are" : "is");
+}
+
+char *get_sender_name(struct mail_data *ml)
+{
+  static char name[MAX_STRING_LENGTH];
+  struct char_data *mob;
+
+  if (!ml) return NULL;
+
+  if (IS_SET_AR(ml->mail_flags, MAIL_FROM_MOB)) {
+    mob = read_mobile(ml->sender, VIRTUAL);
+    if (!mob) {
+      sprintf(name, "Unknown!");
+    } else {
+	  char_to_room(mob, 0);
+	  sprintf(name, "%s", GET_NAME(mob));
+	  extract_char(mob);
+    }
+  } else {
+    if (ml->sender > 0 && ml->sender != NOBODY) {
+      if (get_name_by_id(ml->sender) != NULL) {
+        sprintf(name, "%s", get_name_by_id(ml->sender));
+      } else {
+        sprintf(name, "Unknown!");
+      }
+    } else {
+      /* Must be a special case ID */
+      switch (ml->sender) {
+        case MAIL_FROM_MAIL: sprintf(name, "tbaMUD Mail System");
+                             break;
+
+        default:             sprintf(name, "Invalid Sender!");
+                             break;
+      }
+    }
+  }
+  return (CAP(name));
+}
+
+char *get_recipient_name(struct mail_data *ml)
+{
+  static char name[MAX_STRING_LENGTH];
+
+  if (!ml) return NULL;
+
+  if (ml->recipient > 0) {
+    sprintf(name, "%s", get_name_by_id(ml->recipient));
+  } else {
+    sprintf(name, "Invalid Recipient!");
+  }
+  return (CAP(name));
+}
+
+char *get_sender_name_by_id(long mail_id)
+{
+  struct mail_data *ml;
+  static char *name;
+
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) return NULL;
+
+  name = get_sender_name(ml);
+
+  extract_mail(ml);
+
+  return name;
+}
+
+char *get_recipient_name_by_id(long mail_id)
+{
+  struct mail_data *ml;
+  static char *name;
+
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) return NULL;
+
+  name = get_recipient_name(ml);
+
+  extract_mail(ml);
+
+  return name;
+}
+
+int attachment_count(struct mail_data *ml)
+{
+  int count=0;
+  struct obj_data *obj, *next_obj;
+
+  /* set up the attachments string */
+  if (ml->attachment) {
+    obj = ml->attachment;
+    next_obj = obj->next_content;
+    while (obj) {
+      obj = next_obj;
+      count++;
+    }
+  } else {
+    return 0;
+  }
+  return count;
+}
+
+char *get_mail_text(struct mail_data *ml)
+{
+  static char mail_text[MAX_STRING_LENGTH];
+  char d_t[MAX_STRING_LENGTH], buf[MAX_INPUT_LENGTH], att[66];
+  struct char_data *mob = NULL;
+  struct obj_data *obj, *next_obj;
+  int len=0, this_len=0, count=0, hours, mins;
+
+  if (!ml) return NULL;
+
+  if (IS_SET_AR(ml->mail_flags, MAIL_FROM_MOB)) {
+    mob = read_mobile(ml->sender, VIRTUAL);
+  }
+
+  /* Set up the date/time string */
+  strlcpy(buf, (char *) asctime(localtime(&ml->sent_time)), sizeof(buf));
+  snprintf(d_t, 11, "%s", buf);       /* Start of 'date' - Fri Feb 10 */
+  snprintf(d_t+10, 6, " %s", buf+20); /* Add the year    - 2008       */
+  snprintf(d_t+15, 7, " %s", buf+11); /* Add the 'time'  - 17:56      */
+
+  hours = (time(0) - ml->sent_time) / 3600;  /* How many hours ago */
+  mins  = ((time(0) - ml->sent_time) % 3600) / 60;    /* How many mins ago */
+
+  if (hours >= 24)
+    sprintf(d_t+21, "  (%d day%s %d hours ago)", hours/24, hours>=48 ? "s" : "", hours % 24);
+  else if (hours >= 1)
+    sprintf(d_t+21, "  (%d hour%s %d minutes ago)", hours, hours == 1 ? "" : "s", mins);
+  else
+    sprintf(d_t+21, "  (%d minutes ago)", mins);
+
+  /* set up the attachments string */
+  if (ml->attachment) {
+    obj = ml->attachment;
+    next_obj = obj->next_content;
+    while (obj) {
+      /* No need to extract_obj(obj); - the save function should have already done it */
+      this_len = snprintf(att, sizeof(att)-len-1, "%s", obj->short_description);
+      len += this_len;
+      obj = next_obj;
+      count++;
+    }
+  } else {
+    sprintf(att, "<None!>");
+  }
+  if (len >= 64) strcpy(att+61, "...");
+
+  len = 0;
+
+  len += snprintf(mail_text, sizeof(mail_text)-len, "@YtbaMUD Mail System                                                    @WView Mail@n\r\n");
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "-------------------------------------------------------------------------------\r\n");
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "From        : %s\r\n", get_sender_name(ml) );
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "Sent        : %s\r\n", d_t);
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "Subject     : %s\r\n", ml->subject ? ml->subject : "- No Subject -");
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "Urgency     : %s\r\n", IS_SET_AR(ml->mail_flags, MAIL_URGENT) ? "@RUrgent!@n" : "Normal");
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "Status      : %s\r\n", IS_SET_AR(ml->mail_flags, MAIL_DELETED) ? "@D<Deleted>@n" : (IS_SET_AR(ml->mail_flags, MAIL_READ) ? "Read" : "Unread"));
+
+  if (ml->coins > 0) {
+    if (IS_SET_AR(ml->mail_flags, MAIL_COD))
+      len += snprintf(mail_text+len, sizeof(mail_text)-len, "COD Payment : %d coins\r\n", ml->coins);
+    else
+      len += snprintf(mail_text+len, sizeof(mail_text)-len, "Gold Coins  : %d coins\r\n", ml->coins);
+  }
+
+  if (count) {
+    len += snprintf(mail_text+len, sizeof(mail_text)-len, "Attachments : %s\r\n", att);
+    len += snprintf(mail_text+len, sizeof(mail_text)-len, "              (Total: %d attachment%s)\r\n", count, count > 1 ? "s" : "");
+  }
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "-------------------------------------------------------------------------------\r\n");
+  if (ml->body)
+    len += snprintf(mail_text+len, sizeof(mail_text)-len, "%s\r\n", ml->body);
+  else
+    len += snprintf(mail_text+len, sizeof(mail_text)-len, "- No Message -\r\n");
+  len += snprintf(mail_text+len, sizeof(mail_text)-len, "-------------------------------------------------------------------------------\r\n");
+
+  return (mail_text);
+}
+
+void show_mail_to_char(struct char_data *ch, struct mail_data *ml)
+{
+  page_string(ch->desc, get_mail_text(ml), TRUE);
+}
+
+void mail_view(struct char_data *ch, long mail_id)
+{
+  struct mail_data *ml;
+  int m_num;
+
+  /* to view, we need to load the actual mudmail from the file */
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) {
+    send_to_char(ch, "Sorry, that mail cannot be viewed right now.  Please tell an Imm!\r\n");
+    return;
+  }
+
+  show_mail_to_char(ch, ml);
+
+  m_num = find_mail_by_id(mail_id);
+  if (!IS_MAIL_READ(m_num))
+  {
+    /* Mark as 'read' and save */
+    SET_BIT_AR(ml->mail_flags, MAIL_READ);
+    save_mail(ml);
+
+    /* And mark the index entry and save the index */
+    SET_BIT(mail_table[m_num].flags, MINDEX_READ);
+    save_mail_index();
+  }
+  /* finished with the mail - extract it from memory */
+  extract_mail(ml);
+}
+
+bool mail_receive(struct char_data *ch, long mail_id)
+{
+  struct mail_data *ml;
+  struct obj_data *obj;
+  int i;
+
+  /* first, we need to load the actual mudmail from the file */
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) {
+    send_to_char(ch, "Sorry, that mail cannot be received right now.  Please tell an Imm!\r\n");
+    return FALSE;
+  }
+
+  /* Is payment required? */
+  if (IS_SET_AR(ml->mail_flags, MAIL_COD) && ml->coins > 0) {
+    /* Can player afford the price? */
+    if (GET_GOLD(ch) < ml->coins) {
+      send_to_char(ch, "That mail requires a COD payment of %d coins, and you can't afford it!\r\n", ml->coins);
+      return FALSE;
+    }
+    /* Create the auto-reply */
+    make_cod_payment_mail(ml);
+    /* And take the payment */
+    GET_GOLD(ch) -= ml->coins;
+    ml->coins = 0;
+  }
+
+  /* Give any other attachments to the player */
+  give_mail_attachments(ch, ml);
+
+  /* All checks passed - let's create the mail object */
+  obj = create_obj();
+  obj->item_number = 1;
+  obj->name = strdup("mail paper letter");
+  obj->short_description = strdup("a piece of mail");
+  obj->description = strdup("Someone has left a piece of mail here.");
+
+  GET_OBJ_TYPE(obj) = ITEM_NOTE;
+  for(i = 0; i < TW_ARRAY_MAX; i++)
+    obj->obj_flags.wear_flags[i] = 0;
+  SET_BIT_AR(GET_OBJ_WEAR(obj), ITEM_WEAR_TAKE);
+  GET_OBJ_WEIGHT(obj) = 1;
+  GET_OBJ_COST(obj) = 30;
+  GET_OBJ_RENT(obj) = 10;
+
+
+  obj->action_description = strdup(get_mail_text(ml));
+
+  if (obj->action_description == NULL)
+    obj->action_description = strdup("Mail system error - please report.  Error #11.\r\n");
+
+  obj_to_char(obj, ch);
+
+  extract_mail(ml);
+
+  /* And erase the mail from the system */
+  delete_mail_index_entry(mail_id);
+
+  return TRUE;
+}
+
+bool mail_delmark(struct char_data *ch, long mail_id)
+{
+  struct mail_data *ml;
+  int m_num;
+
+  /* to view, we need to load the actual mudmail from the file */
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) {
+    send_to_char(ch, "Sorry, that mail cannot be marked for deletion right now.  Please tell an Imm!\r\n");
+    return FALSE;
+  }
+
+  m_num = find_mail_by_id(mail_id);
+  if (!IS_MAIL_DELETED(m_num))
+  {
+    /* Mark as 'deleted' and save */
+    SET_BIT_AR(ml->mail_flags, MAIL_DELETED);
+    save_mail(ml);
+
+    /* And mark the index entry and save the index */
+    SET_BIT(mail_table[m_num].flags, MINDEX_DELETED);
+    save_mail_index();
+  } else {
+    /* Remove deletion mark flag and save */
+    REMOVE_BIT_AR(ml->mail_flags, MAIL_DELETED);
+    save_mail(ml);
+
+    /* And unmark the index entry and save the index */
+    REMOVE_BIT(mail_table[m_num].flags, MINDEX_DELETED);
+    save_mail_index();
+  }
+  /* finished with the mail - extract it from memory */
+  extract_mail(ml);
+  return TRUE;
+}
+
+bool mail_forward(struct char_data *ch, long mail_id, long recipient)
+{
+  char fwd_subject[MAX_STRING_LENGTH];
+  struct mail_data *ml;
+
+  /* to view, we need to load the actual mudmail from the file */
+  ml = create_mail();
+  if (!load_mail(mail_id, ml)) {
+    send_to_char(ch, "Sorry, that mail cannot be forwarded right now.  Please tell an Imm!\r\n");
+    return FALSE;
+  }
+  /* Remove the ID from the old mail - it will be allocated a new one when saving */
+  ml->mail_id = NO_MAIL;
+
+  if (ml->subject) {
+    sprintf(fwd_subject, "FW: %s", ml->subject);
+    free(ml->subject);
+  } else {
+    sprintf(fwd_subject, "FW: - No Subject! -");
+  }
+
+  ml->subject   = strdup(fwd_subject);
+  ml->recipient = recipient;
+  ml->sender    = GET_ID(ch);
+
+  save_mail(ml);
+
+  /* finished with the mail - extract it from memory */
+  extract_mail(ml);
+
+  notify_if_playing(ch, recipient);
+
+  return TRUE;
+}
+
+long get_id_by_inbox_num(struct char_data *ch, int num)
+{
+  int i, inbox_num=0;
+
+  if (!ch || IS_NPC(ch)) return NO_MAIL;
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].recipient == GET_ID(ch) && !IS_MAIL_DRAFT(i)) {
+      if ((++inbox_num) == num)
+        return mail_table[i].mail_id;
+    }
+  }
+  /* Not Found */
+  return NO_MAIL;
+}
+
+long get_id_by_outbox_num(struct char_data *ch, int num)
+{
+  int i, inbox_num=0;
+
+  if (!ch || IS_NPC(ch)) return NO_MAIL;
+
+  for (i = 0; i <= top_of_mail_table; i++) {
+    if (mail_table[i].sender == GET_ID(ch) && IS_MAIL_DRAFT(i)) {
+      if ((++inbox_num) == num)
+        return mail_table[i].mail_id;
+    }
+  }
+  /* Not Found */
+  return NO_MAIL;
+}
+
+void mail_view_by_num(struct char_data *ch, int num)
+{
+  long mail_id;
+
+  if (!ch || IS_NPC(ch)) return;
+
+  if ((mail_id = get_id_by_inbox_num(ch, num)) == NO_MAIL) {
+    send_to_char(ch, "That mail exists only in your imaginiation!\r\n");
+    return;
+  }
+
+  mail_view(ch, mail_id);
+}
+
+bool mail_receive_by_num(struct char_data *ch, int num)
+{
+  long mail_id;
+  bool ret;
+
+  if (!ch || IS_NPC(ch)) return FALSE;
+
+  if ((mail_id = get_id_by_inbox_num(ch, num)) == NO_MAIL) {
+    send_to_char(ch, "That mail exists only in your imaginiation!\r\n");
+    return FALSE;
+  }
+
+  ret = mail_receive(ch, mail_id);
+  return(ret);
+}
+
+bool mail_delmark_by_num(struct char_data *ch, int num)
+{
+  long mail_id;
+  bool ret;
+
+  if (!ch || IS_NPC(ch)) return FALSE;
+
+  if ((mail_id = get_id_by_inbox_num(ch, num)) == NO_MAIL) {
+    send_to_char(ch, "That mail exists only in your imaginiation!\r\n");
+    return FALSE;
+  }
+
+  ret = mail_delmark(ch, mail_id);
+  return(ret);
+}
+
+/* The 'mail' command parser - can only be used in rooms with the MAIL flag */
+ACMD(do_mail)
+{
+  char buf[MAX_INPUT_LENGTH], arg[MAX_INPUT_LENGTH], arg2[MAX_INPUT_LENGTH], arg3[MAX_INPUT_LENGTH], *arg4;
+  char **mailwrite;
+  struct char_data *mailman;
+  long recipient, mail_id;
+  int num;
+
+  if (!CONFIG_CAN_MAIL) {
+    send_to_char(ch, "Sorry, the mudmail system is currently offline.\r\n");
+    return;
+  }
+
+  if (IS_NPC(ch)) {
+    send_to_char(ch, "Only players can send and receive mails. Get a builder to write you a script!\r\n");
+    return;
+  }
+
+  /* Get the 'mailman' that gives 'tell' messages */
+  if (GET_ADMLEVEL(ch) < CONFIG_MIN_MAIL_ANYWHERE) {
+    if (!ROOM_FLAGGED(IN_ROOM(ch), ROOM_MAIL)) {
+      send_to_char(ch, "You can only send an receive mail in a post office\r\n");
+      return;
+    }
+
+    if ((mailman = find_mailman(ch)) == NULL)
+    {
+      send_to_char(ch, "The postmaster is currently not here! You can't do this yourself!\r\n");
+      return;
+    }
+  } else {
+    /* If the immortal mailman wasn't found, try the current room */
+    if ((mailman = find_immortal_mailman()) == NULL) {
+      mudlog(NRM, ADMLVL_GOD, TRUE, "SYSERR: Immortal mailman not found in room %d", MAIL_IMMORTAL_ROOM);
+      if (!ROOM_FLAGGED(IN_ROOM(ch), ROOM_MAIL)) {
+        send_to_char(ch, "Sorry, the immortal mailman is broken. You will need to find a postmaster!\r\n");
+        return;
+      }
+      if ((mailman = find_mailman(ch)) == NULL)
+      {
+        send_to_char(ch, "Sorry, the immortal mailman is broken. You will need to find a postmaster!\r\n");
+        return;
+      }
+	}
+  }
+
+  if (GET_ADMLEVEL(ch) < CONFIG_MIN_MAIL_LEVEL) {
+    snprintf(buf, sizeof(buf), "$n tells you, 'Sorry, you have to be level %d to send mail!'", CONFIG_MIN_MAIL_LEVEL);
+    act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    return;
+  }
+
+  /* Grab 4 arguments to begin with */
+  arg4 = one_argument(two_arguments(argument, arg, arg2), arg3);
+
+  if (!*arg) {
+    /* No args entered - enter OLC mode, with inbox visible */
+    do_mailedit(ch, argument, cmd, subcmd);
+  } else if (is_abbrev(arg, "inbox")) {
+    show_inbox_to_char(ch);
+    return;
+  } else if (is_abbrev(arg, "check")) {
+    if (has_mail(ch))
+      act("$n tells you, 'You have mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
+    else
+      act("$n tells you, 'Sorry, you don't have any mail waiting.'", FALSE, mailman, 0, ch, TO_VICT);
+    return;
+  } else if (is_abbrev(arg, "view") || is_abbrev(arg, "read")) {
+	num = atoi(arg2);
+	if (num < 1) {
+      act("$n tells you, 'That's not a valid mail number'", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+	}
+	mail_view_by_num(ch, num);
+    return;
+  } else if (is_abbrev(arg, "receive")) {
+    num = atoi(arg2);
+    if (num < 1) {
+      act("$n tells you, 'That's not a valid mail number'", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    if (mail_receive_by_num(ch, num)) {
+      act("$n hands you your mail.", FALSE, mailman, 0, ch, TO_VICT);
+    }
+    return;
+  } else if (is_abbrev(arg, "delete")) {
+	num = atoi(arg2);
+	if (num < 1) {
+      act("$n tells you, 'That's not a valid mail number'", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+	}
+	mail_delmark_by_num(ch, num);
+    return;
+  } else if (is_abbrev(arg, "purge")) {
+    /* purge all mails marked as deleted */
+    num = purge_marked_mail(ch);
+    if (num > 0) {
+      snprintf(buf, sizeof(buf), "$n tells you, '%d deleted mail%s ha%s been purged.'", num, num == 1 ? "" : "s", num == 1 ? "s" : "ve");
+      act(buf, FALSE, mailman, 0, ch, TO_VICT);
+    } else {
+      act("$n tells you, 'You don't have any deleted mails to purge.'", FALSE, mailman, 0, ch, TO_VICT);
+    }
+  } else if (is_abbrev(arg, "reply")) {
+    if (CONFIG_STAMP_COST > 0 && GET_GOLD(ch) < CONFIG_STAMP_COST && GET_ADMLEVEL(ch) < CONFIG_FREE_MAIL_LEVEL) {
+      snprintf(buf, sizeof(buf), "$n tells you, 'A stamp costs %d coin%s.'\r\n"
+                                 "$n tells you, '...which I see you can't afford.'", CONFIG_STAMP_COST,
+                                 CONFIG_STAMP_COST == 1 ? "" : "s");
+      act(buf, FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    num = atoi(arg2);
+    if (num < 1) {
+      act("$n tells you, 'That's not a valid mail number'", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    /* Get the mail's ID number */
+    if ((mail_id = get_id_by_inbox_num(ch, num)) == NO_MAIL) {
+      send_to_char(ch, "That mail exists only in your imaginiation!\r\n");
+      return;
+    }
+    /* And then get the mail index rnum */
+    num = find_mail_by_id(mail_id);
+
+    if (IS_SET(mail_table[num].flags, MINDEX_FROM_MOB)) {
+      act("That mail was sent from an NPC, not another character!\r\n", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+
+    recipient = mail_table[num].sender;
+
+    act("$n starts to write some mail.", TRUE, ch, 0, 0, TO_ROOM);
+    if (CONFIG_STAMP_COST > 0 &&  GET_ADMLEVEL(ch) < CONFIG_FREE_MAIL_LEVEL) {
+    snprintf(buf, sizeof(buf), "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
+         "$n tells you, 'Write your message. (/s saves /h for help).'",
+           CONFIG_STAMP_COST);
+      GET_GOLD(ch) -= CONFIG_STAMP_COST;
+    } else {
+      snprintf(buf, sizeof(buf), "$n tells you, 'You don't have to pay for mails'\r\n"
+           "$n tells you, 'Write your message. (/s saves /h for help).'");
+    }
+    act(buf, FALSE, mailman, 0, ch, TO_VICT);
+
+
+    SET_BIT_AR(PLR_FLAGS(ch), PLR_MAILING);	/* string_write() sets writing. */
+
+    /* Start writing! */
+    CREATE(mailwrite, char *, 1);
+    string_write(ch->desc, mailwrite, MAX_MAIL_SIZE, recipient, NULL);
+  } else if (is_abbrev(arg, "forward")) {
+	num = atoi(arg2);
+	if (num < 1) {
+      act("$n tells you, 'That's not a valid mail number'", FALSE, mailman, 0, ch, TO_VICT);
+      return;
+	}
+	/* Get the mail's ID number */
+    if ((mail_id = get_id_by_inbox_num(ch, num)) == NO_MAIL) {
+      send_to_char(ch, "That mail exists only in your imaginiation!\r\n");
+      return;
+    }
+    if ((recipient = get_id_by_name(arg3)) < 0 || !mail_recip_ok(arg3)) {
+      act("$n tells you, 'No one by that name is registered here!'",
+      FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    /* Now forward it */
+    if (!mail_forward(ch, mail_id, recipient)) {
+      act("$n tells you, 'Sorry, it was not possible to forward your mail.'", FALSE, mailman, 0, ch, TO_VICT);
+    } else {
+      act("$n tells you, 'Your mail has been sent!'", FALSE, mailman, 0, ch, TO_VICT);
+    }
+  } else if (is_abbrev(arg, "list") && (GET_ADMLEVEL(ch) == ADMLVL_IMPL)) {
+    mail_list_to_admin(ch);
+  } else {  /* Assume the old-style "mail <player>" */
+    if (CONFIG_STAMP_COST > 0 && GET_GOLD(ch) < CONFIG_STAMP_COST && GET_ADMLEVEL(ch) < CONFIG_FREE_MAIL_LEVEL) {
+      snprintf(buf, sizeof(buf), "$n tells you, 'A stamp costs %d coin%s.'\r\n"
+                                 "$n tells you, '...which I see you can't afford.'", CONFIG_STAMP_COST,
+                                 CONFIG_STAMP_COST == 1 ? "" : "s");
+      act(buf, FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    if ((recipient = get_id_by_name(arg)) < 0 || !mail_recip_ok(arg)) {
+      act("$n tells you, 'No one by that name is registered here!'",
+      FALSE, mailman, 0, ch, TO_VICT);
+      return;
+    }
+    act("$n starts to write some mail.", TRUE, ch, 0, 0, TO_ROOM);
+    if (CONFIG_STAMP_COST > 0 &&  GET_ADMLEVEL(ch) < CONFIG_FREE_MAIL_LEVEL) {
+      snprintf(buf, sizeof(buf), "$n tells you, 'I'll take %d coins for the stamp.'\r\n"
+           "$n tells you, 'Write your message. (/s saves /h for help).'",
+           CONFIG_STAMP_COST);
+      GET_GOLD(ch) -= CONFIG_STAMP_COST;
+    } else {
+      snprintf(buf, sizeof(buf), "$n tells you, 'You don't have to pay for mails'\r\n"
+           "$n tells you, 'Write your message. (/s saves /h for help).'");
+    }
+    act(buf, FALSE, mailman, 0, ch, TO_VICT);
+
+
+    SET_BIT_AR(PLR_FLAGS(ch), PLR_MAILING);	/* string_write() sets writing. */
+
+    /* Start writing! */
+    CREATE(mailwrite, char *, 1);
+    string_write(ch->desc, mailwrite, MAX_MAIL_SIZE, recipient, NULL);
+  }
+}
+
+
diff --git a/src/mail.h b/src/mail.h
index dfba68e..dfce3ad 100644
--- a/src/mail.h
+++ b/src/mail.h
@@ -1,108 +1,212 @@
-/**
-* @file mail.h
-* Public procs, macro defs, subcommand defines mudmail system.
-* 
-* Part of the core tbaMUD source code distribution, which is a derivative
-* of, and continuation of, CircleMUD.
-*                                                                        
-* All rights reserved.  See license for complete information.                                                                
-* Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University 
-* CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.
-* By Jeremy Elson.
-*/
-#ifndef _MAIL_H_
-#define _MAIL_H_
-
-/* You can modify the following constants to fit your own MUD.  */
-
-/* minimum level a player must be to send mail	*/
-#define MIN_MAIL_LEVEL 1
-
-/* # of gold coins required to send mail	*/
-#define STAMP_PRICE 150
-
-/* Maximum size of mail in bytes (arbitrary)	*/
-#define MAX_MAIL_SIZE 8192
-
-/* size of mail file allocation blocks		*/
-#define BLOCK_SIZE 100
-
-/* General, publicly available functions */
-SPECIAL(postmaster);
-
-/* NOTE:  Make sure that your block size is big enough. If not, HEADER_BLOCK_
- * DATASIZE will end up negative.  This is a bad thing. Check the define below 
- * to make sure it is >0 when choosing values for NAME_SIZE and BLOCK_SIZE.  
- * 100 is a nice round number for BLOCK_SIZE and is the default. The mail system
- * will always allocate disk space in chunks of size BLOCK_SIZE. */
-
-/* DON'T TOUCH DEFINES BELOW. */
-int	scan_file(void);
-int	has_mail(long recipient);
-void	store_mail(long to, long from, char *message_pointer);
-char	*read_delete(long recipient);
-void    notify_if_playing(struct char_data *from, int recipient_id);
-
-struct mail_t {
-	long recipient;
-	long sender;
-	time_t sent_time;
-	char *body;
-};
-
-/* old stuff below */
-#define HEADER_BLOCK  (-1)
-#define LAST_BLOCK    (-2)
-#define DELETED_BLOCK (-3)
-
-/* Note: next_block is part of header_blk in a data block; we can't combine them
- * here because we have to be able to differentiate a data block from a header 
- * block when booting mail system. */
-struct header_data_type {
-   long	next_block;		/* if header block, link to next block	*/
-   long from;			/* idnum of the mail's sender		*/
-   long to;			/* idnum of mail's recipient		*/
-   time_t mail_time;		/* when was the letter mailed?		*/
-};
-
-/* size of the data part of a header block */
-#define HEADER_BLOCK_DATASIZE \
-	(BLOCK_SIZE - sizeof(long) - sizeof(struct header_data_type) - sizeof(char))
-
-/* size of the data part of a data block */
-#define DATA_BLOCK_DATASIZE (BLOCK_SIZE - sizeof(long) - sizeof(char))
-
-/* note that an extra space is allowed in all string fields for the
-   terminating null character.  */
-
-struct header_block_type_d {
-   long	block_type;		/* is this a header or data block?	*/
-   struct header_data_type header_data;	/* other header data		*/
-   char	txt[HEADER_BLOCK_DATASIZE+1]; /* actual text plus 1 for null	*/
-};
-
-struct data_block_type_d {
-   long	block_type;		/* -1 if header block, -2 if last data block
-      				   in mail, otherwise a link to the next */
-   char	txt[DATA_BLOCK_DATASIZE+1]; /* actual text plus 1 for null	*/
-};
-
-typedef struct header_block_type_d header_block_type;
-typedef struct data_block_type_d data_block_type;
-
-struct position_list_type_d {
-   long	position;
-   struct position_list_type_d *next;
-};
-
-typedef struct position_list_type_d position_list_type;
-
-struct mail_index_type_d {
-   long recipient;			/* who is this mail for?	*/
-   position_list_type *list_start;	/* list of mail positions	*/
-   struct mail_index_type_d *next;	/* link to next one		*/
-};
-
-typedef struct mail_index_type_d mail_index_type;
-
-#endif /* _MAIL_H_ */
+/***************************************************************************
+ * @file mail.h                                                            *
+ * Public procs, macro defs, subcommand defines mudmail system.            *
+ *                                                                         *
+ * Part of the core tbaMUD source code distribution, which is a derivative *
+ * of, and continuation of, CircleMUD.                                     *
+ *                                                                         *
+ * All rights reserved.  See license for complete information.             *
+ * Copyright (C) 1993, 94 by the Trustees of the Johns Hopkins University  *
+ * CircleMUD is based on DikuMUD, Copyright (C) 1990, 1991.                *
+ *  By Jeremy Elson.                                                       *
+ **************************************************************************/
+
+/* A handy 'flag' define - probably better in utils.h? */
+#define FLAG(n) (1 << (n))
+
+/* Maximum size of mail in bytes (arbitrary)	*/
+#define MAX_MAIL_SIZE 8192
+#define MAX_MAIL_ID   2000000000
+
+/* For mail anywhere to work, we need to know which room to find the immortal mailman in */
+#define MAIL_IMMORTAL_ROOM 1205
+
+/* Mail index flags - mostly essential info that should be known before reading mails */
+#define MINDEX_DELETED   FLAG(0)  /* Mail has been marked for deletion     */
+#define MINDEX_URGENT    FLAG(1)  /* Mail is flagged as urgent by sender   */
+#define MINDEX_HAS_OBJ   FLAG(2)  /* Mail has an attached object           */
+#define MINDEX_HAS_GOLD  FLAG(3)  /* Mail contains some gold coins         */
+#define MINDEX_IS_COD    FLAG(4)  /* Mail requires some gold coins         */
+#define MINDEX_FROM_MOB  FLAG(5)  /* Mail has been sent by using scripts   */
+#define MINDEX_READ      FLAG(6)  /* Mail has been viewed but not received */
+#define MINDEX_DRAFT     FLAG(7)  /* Mail is an unsent draft copy          */
+
+/* Mail Flags */
+#define MAIL_DELETED  1  /* Marks mail for deletion with next purge */
+#define MAIL_URGENT   2  /* This mail is flagged as urgent?         */
+#define MAIL_COD      3  /* Means coins amount is required payment  */
+#define MAIL_FROM_MOB 4  /* Specifies that 'sender' is a mob vnum   */
+#define MAIL_READ     5  /* Mail has been read by recipient         */
+#define MAIL_DRAFT    6  /* Mail is a draft (not yet sent)          */
+
+#define IS_MAIL_DELETED(i) (IS_SET(mail_table[(i)].flags, MINDEX_DELETED))
+#define IS_MAIL_URGENT(i)  (IS_SET(mail_table[(i)].flags, MINDEX_URGENT))
+#define IS_MAIL_DRAFT(i)   (IS_SET(mail_table[(i)].flags, MINDEX_DRAFT))
+#define IS_MAIL_READ(i)    (IS_SET(mail_table[(i)].flags, MINDEX_READ))
+#define IS_MAIL_COD(i)     (IS_SET(mail_table[(i)].flags, MINDEX_IS_COD))
+#define MAIL_HAS_OBJECT(i) (IS_SET(mail_table[(i)].flags, MINDEX_HAS_OBJ))
+#define MAIL_HAS_GOLD(i)   (IS_SET(mail_table[(i)].flags, MINDEX_HAS_GOLD))
+
+#define MAIL_URGENT_COLOR(i) (IS_MAIL_URGENT(i) ? QBRED : QNRM)
+
+/* Mail editor submodes */
+#define MAILEDIT_INBOX        0
+#define MAILEDIT_OUTBOX       1
+#define MAILEDIT_MAILEDIT     2
+#define MAILEDIT_VIEW         3
+#define MAILEDIT_REPLY        4
+#define MAILEDIT_FORWARD      5
+#define MAILEDIT_RECEIVE      6
+#define MAILEDIT_DELETE       7
+#define MAILEDIT_BACK_TO_MENU 8
+#define MAILEDIT_ATTACHMENTS  9
+#define MAILEDIT_ASK_DRAFT    10
+#define MAILEDIT_ASK_QUIT     11
+#define MAILEDIT_OUTEDIT      12
+#define MAILEDIT_OUTVIEW      13
+#define MAILEDIT_OUTDELETE    14
+#define MAILEDIT_RECIP_MENU   15
+#define MAILEDIT_ADD_RECIP    16
+#define MAILEDIT_DEL_RECIP    17
+#define MAILEDIT_CLR_RECIP    18
+#define MAILEDIT_ATTACH_MENU  19
+#define MAILEDIT_ADD_ATTACH   20
+#define MAILEDIT_DEL_ATTACH   21
+#define MAILEDIT_CLR_ATTACH   22
+#define MAILEDIT_GET_SUBJECT  23
+#define MAILEDIT_GET_GOLD     24
+#define MAILEDIT_GET_BODYTEXT 25
+#define MAILEDIT_PURGE_N_QUIT 26
+
+/* Mail Editor handy defines */
+#define MAILEDIT_SUBJECT  ((OLC_MAIL(d)->mail)->subject)
+#define MAILEDIT_BODYTEXT ((OLC_MAIL(d)->mail)->body)
+#define MAILEDIT_GOLD     ((OLC_MAIL(d)->mail)->coins)
+#define MAILEDIT_URGENT   (IS_SET_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_URGENT))
+#define MAILEDIT_COD      (IS_SET_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_COD))
+
+/* Copy modes for mail_copy */
+#define MAIL_COPY_NORMAL  0
+#define MAIL_COPY_FORWARD 1
+#define MAIL_COPY_REPLY   2
+
+/* Special-case sender/recipient ID's for get_sender_name, should be below zero (above zero = player id) */
+#define MAIL_TO_NOBODY   0  /* Used internally - do not change this one!          */
+#define MAIL_FROM_MAIL  -1  /* (sender)    Mail from the tbaMUD mail system       */
+#define MAIL_TO_IMMS    -2  /* (recipient) Mail to all the MUD's immortals        */
+#define MAIL_TO_ALL     -3  /* (recipient) Mail to all players (usually Imp-only) */
+/* Note - changing the list above needs changing the list at the top of mail.c too */
+
+/* This number should match the mail_groups list at the top of mail.c */
+#define NUM_MAIL_GROUPS  2
+
+#define ML_ARRAY_MAX 4
+#define NO_MAIL      -1
+
+struct recipient_list {
+  long recipient;
+  struct recipient_list *next;
+};
+
+struct mail_data {
+  long mail_id;
+  long recipient;
+  long sender;
+  time_t sent_time;
+  char *subject;
+  char *body;
+  struct obj_data *attachment;
+  int coins;
+  int mail_flags[ML_ARRAY_MAX];
+};
+
+struct mail_edit_data {
+  struct mail_data *mail;
+  struct recipient_list *recipients;
+};
+
+struct mail_index {
+  long mail_id;
+  long recipient;
+  long sender;
+  time_t sent_time;
+  char *subject;
+  int flags;
+};
+
+struct mail_group {
+  char name[MAX_NAME_LENGTH+1];   /* name entered by player                */
+  long recipient;                 /* The special recipient ID (below zero) */
+};
+
+/* Functions in mail.c (in the order they appear) */
+bool build_mail_index(void);                                      /* Load the mudmail index file on MUD startup    */
+long new_mail_id(void);                                           /* Get a unique ID for a new mudmail             */
+void free_mail_index(void);                                       /* Erase the entire mudmail index from memory    */
+void free_mail(struct mail_data *mail);                           /* Free memory used by one mail_data structure   */
+void extract_mail(struct mail_data *mail);                        /* Free memory used by one mail_data structure   */
+int  find_mail_by_id(long mail_id);                               /* Get the mail index rnum from the mail id      */
+void copy_mail_index_entry(struct mail_index *to, struct mail_index *from); /* Make a copy of an index entry       */
+void copy_mail(struct mail_data *to, struct mail_data *from, int copy_mode); /* Copy the mail data to a new mail   */
+int  create_mail_index_entry(struct mail_data *mail);             /* Add a mail to the mudmail index list          */
+bool delete_mail_index_entry(int mail_id);                        /* Delete one mudmail from the index (by id)     */
+bool save_mail_index(void);                                       /* Save the mail index, returns TRUE on success  */
+int  handle_mail_obj(struct obj_data *temp, struct mail_data *ml);/* Put loaded objects into the actual mail       */
+bool check_mail_dir(long mail_id);                                /* Check that a mail folder exists or create it  */
+bool save_as_draft(struct char_data *ch, struct mail_data *ml);   /* Save mail as a draft for sending later        */
+bool save_mail(struct mail_data *ml);                             /* Save the actual mail for the mudmail file     */
+bool load_mail(long mail_id, struct mail_data *ml);               /* Load mail by id - put data into ml            */
+void draft_timeout(void);                                         /* Perform a timeout on old draft mails          */
+bool mail_recip_ok(const char *name);                             /* Validate a player name for recipients         */
+struct char_data *find_mailman(struct char_data *ch);             /* returns a mailman in the same room as player  */
+struct char_data *find_immortal_mailman(void);                    /* returns a mailman in immortal mail room       */
+int  show_inbox_to_char(struct char_data *ch);                    /* Displays the player's inbox                   */
+int  show_outbox_to_char(struct char_data *ch);                   /* Displays the player's outbox                  */
+void give_mail_attachments(struct char_data *ch, struct mail_data *ml);  /* give all mail attachments to a player  */
+int  count_recipients(struct mail_edit_data *ml_list);            /* Count the number of recipients in edited mail */
+void clear_mail_data(struct mail_data *ml);                       /* Set all values in struct to zero or NULL      */
+int  purge_marked_mail(struct char_data *ch);                     /* purges all marked mail for one player         */
+struct mail_data *create_mail(void);                              /* Create a new blank mail_data structure        */
+bool add_recipient(struct mail_edit_data *ml, long player_id);    /* Add a recipient to list for mailing           */
+bool remove_recipient(struct mail_edit_data *ml, long player_id); /* Remove a recipient from the list for mailing  */
+void clear_recipients(struct mail_edit_data *ml);                 /* Clear a whole recipient list                  */
+char *recipient_list(struct mail_edit_data *ml);                  /* Get a list of all recipients                  */
+long get_mail_group_by_name(char *name);                          /* Get the recipient id from the group name      */
+void list_attachments_numbered(struct obj_data *list, struct char_data *ch); /* Stacked list of attachments        */
+struct obj_data *get_attachment_numbered(struct char_data *ch, struct obj_data *list, int find_num); /* Return obj by stacked list line  */
+bool mail_from_player(long to, long from, char *message_pointer); /* Send a mail from a player to another player   */
+bool mail_from_mobile(struct char_data *mob);                     /* Send a mail from a mob using scripts          */
+void make_cod_payment_mail(struct mail_data *orig);               /* Send an auto-COD reply back to mail sender    */
+bool perform_send_edited(struct char_data *ch, struct mail_edit_data *ml_list);   /* Send to multiple recipients   */
+bool perform_mob_send_edited(struct char_data *mob);              /* Send a scripted mob mudmail                   */
+void create_mob_mail(struct char_data *mob);                      /* Create a blank mail structure if needed       */
+bool has_mail(struct char_data *ch);                              /* returns TRUE is player has mail waiting       */
+int  count_deleted(struct char_data *ch);                         /* Returns the number of mails marked as deleted */
+void notify_if_playing(struct char_data *from, int recipient_id); /* Inform a player of a new mail arrival         */
+void notify_on_login(struct char_data *ch);                       /* Tell player how many new mails they have      */
+char *get_sender_name(struct mail_data *ml);                      /* Get the name of the mail sender by mail_data  */
+char *get_sender_name_by_id(long mail_id);                        /* Get the name of the mail sender by mail_id    */
+char *get_recipient_name(struct mail_data *ml);                   /* Get the name of the mail recip by mail_data   */
+char *get_recipient_name_by_id(long mail_id);                     /* Get the name of the mail recipient by mail_id */
+int  attachment_count(struct mail_data *ml);                      /* Count the number of mail attachments          */
+char *get_mail_text(struct mail_data *ml);                        /* Create the text string thats shown to players */
+void show_mail_to_char(struct char_data *ch, struct mail_data *ml); /* Display full mail details to player         */
+void mail_view(struct char_data *ch, long mail_id);               /* Show a mail to a player (by mail id)          */
+bool mail_receive(struct char_data *ch, long mail_id);            /* Convert a mail into an actual object in inv   */
+bool mail_delmark(struct char_data *ch, long mail_id);            /* Mark a mail for deletion at next purge        */
+bool mail_forward(struct char_data *ch, long mail_id, long recipient); /* Forward a mail without changing any text */
+long get_id_by_inbox_num(struct char_data *ch, int num);          /* Work out which mail_id player wants to use    */
+long get_id_by_outbox_num(struct char_data *ch, int num);         /* Work out which mail_id player wants to use    */
+void mail_view_by_num(struct char_data *ch, int num);             /* Show a mail to player by inbox entry number   */
+bool mail_receive_by_num(struct char_data *ch, int num);          /* Receive a mail by inbox entry number          */
+bool mail_delmark_by_num(struct char_data *ch, int num);          /* Mark as deleted by inbox entry number         */
+ACMD(do_mail);
+
+/* Functions in mailedit.c */
+ACMD(do_mailedit);                                                /* The mail edit command, called from do_mail    */
+void mailedit_setup(struct descriptor_data *d);                   /* Setup a blank structure ready for editing     */
+void mailedit_cleanup(struct descriptor_data *d);                 /* Free up the actual OLC structure for exiting  */
+void mailedit_disp_menu(struct descriptor_data *d);               /* Display inbox menu view                       */
+void mailedit_disp_mail(struct descriptor_data *d);               /* Display main mail editor (for edit/reply/etc) */
+void mailedit_parse(struct descriptor_data *d, char *arg);        /* The mail mailedit parser                      */
+
diff --git a/src/mailedit.c b/src/mailedit.c
new file mode 100755
index 0000000..d08b9f0
--- /dev/null
+++ b/src/mailedit.c
@@ -0,0 +1,898 @@
+/**************************************************************************
+*  File: mailedit.c                                        Part of tbaMUD *
+*  Usage: Oasis OLC - Mudmail.                                            *
+*                                                                         *
+* Copyright 1996 Harvey Gilpin. 1997-2001 George Greer. 2010 Stefan Cole. *
+**************************************************************************/
+
+#include "conf.h"
+#include "sysdep.h"
+#include "structs.h"
+#include "utils.h"
+#include "interpreter.h"
+#include "db.h"
+#include "comm.h"
+#include "handler.h"
+#include "modify.h"
+#include "mail.h"
+#include "oasis.h"
+#include "improved-edit.h"
+
+/* External functions */
+void list_obj_to_char(struct obj_data *list, struct char_data *ch, int mode, int show);
+
+/* external global variables */
+extern const struct mail_group mail_groups[];
+
+/*  utility functions */
+ACMD(do_mailedit)
+{
+  struct descriptor_data *d;
+
+  d = ch->desc;
+
+  /* Give descriptor an OLC structure. */
+  if (d->olc) {
+    mudlog(BRF, ADMLVL_IMMORT, TRUE,
+      "SYSERR: do_oasis_medit: Player already had olc structure.");
+    free(d->olc);
+  }
+
+  CREATE(d->olc, struct oasis_olc_data, 1);
+
+  OLC_ZNUM(d) = NOWHERE;
+  OLC_NUM(d)  = 0;
+
+  mailedit_setup(d);
+  mailedit_disp_menu(d);
+
+  /* Display messages to the players in the same room as the
+     player and also log it. */
+  act("$n starts editing mail.", TRUE, ch, 0, 0, TO_ROOM);
+  SET_BIT_AR(PLR_FLAGS(ch), PLR_MAILING);
+  SET_BIT_AR(PLR_FLAGS(ch), PLR_WRITING);
+  STATE(d) = CON_MAILEDIT;
+
+  mudlog(CMP, ADMLVL_IMMORT, TRUE,"MAIL: %s starts editing mudmail in room %d",
+    GET_NAME(ch), world[IN_ROOM(d->character)].number);
+}
+
+/* No 'new' or 'existing' to edit - just set up the mudmail structures */
+void mailedit_setup(struct descriptor_data *d)
+{
+  struct mail_edit_data *mail_info;
+
+  /* Allocate a scratch mudmails structure. */
+  CREATE(mail_info, struct mail_edit_data, 1);
+
+  mail_info->mail       = create_mail();
+  mail_info->recipients = NULL;
+
+  OLC_MAIL(d) = mail_info;
+
+  /* Has changed flag. (It hasn't so far, we just made it.) */
+  OLC_VAL(d) = FALSE;
+
+}
+
+/* clear up memory used by the mudmail structures */
+void mailedit_cleanup(struct descriptor_data *d)
+{
+  struct mail_edit_data *mail_info;
+  struct mail_data *single_mail;
+  struct obj_data *obj;
+
+  mail_info = OLC_MAIL(d);
+  single_mail = mail_info->mail;
+
+  if (single_mail) {
+    /* Any leftover attachments should be passed back to the owner */
+    while (single_mail->attachment) {
+      obj = single_mail->attachment;
+      obj_from_mail(obj);
+      obj_to_char(obj, d->character);
+    }
+    /* Any leftover gold is returned too */
+    if ((single_mail->coins > 0) && !IS_SET_AR(single_mail->mail_flags, MAIL_COD)) {
+      GET_GOLD(d->character) += single_mail->coins;
+      single_mail->coins = 0;
+	}
+    if (single_mail->subject) free(single_mail->subject);
+    if (single_mail->body)    free(single_mail->body);
+    single_mail = NULL;
+    free (mail_info->mail);
+  }
+  clear_recipients(mail_info);
+  mail_info = NULL;
+  free(OLC_MAIL(d));
+  OLC_MAIL(d) = NULL;
+}
+
+/* Menu functions */
+/* The 'main menu' - displays inbox, with options */
+void mailedit_disp_menu(struct descriptor_data *d)
+{
+  get_char_colors(d->character);
+  clear_screen(d);
+
+  write_to_output(d, "tbaMUD Mail Editor\r\n");
+  show_inbox_to_char(d->character);
+  if (CONFIG_DRAFTS_ALLOWED)
+    write_to_output(d, "%s(%sC%s)%s Create         %s(%sV%s)%s View          %s(%sR%s)%s Reply         %s(%sF%s)%s Forward       \r\n"
+                       "%s(%sE%s)%s Receive        %s(%sD%s)%s Delete        %s(%sO%s)%s Outbox        %s(%sQ%s)%s Quit          \r\n",
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm );
+  else
+    write_to_output(d, "%s(%sC%s)%s Create         %s(%sV%s)%s View          %s(%sR%s)%s Reply         %s(%sF%s)%s Forward       \r\n"
+                       "%s(%sE%s)%s Receive        %s(%sD%s)%s Delete        %s(%sQ%s)%s Quit          \r\n",
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm,
+                       cyn, yel, cyn, nrm );
+  write_to_output(d, "Enter Selection: ");
+
+  OLC_MODE(d) = MAILEDIT_INBOX;
+}
+
+void mailedit_disp_outbox(struct descriptor_data *d)
+{
+  get_char_colors(d->character);
+  clear_screen(d);
+
+  write_to_output(d, "tbaMUD Mail Editor\r\n");
+  show_outbox_to_char(d->character);
+  write_to_output(d, "%s(%sE%s)%s Edit      %s(%sV%s)%s View      %s(%sD%s)%s Delete      %s(%sI%s)%s Inbox     %s(%sQ%s)%s Quit\r\n",
+                     cyn, yel, cyn, nrm,
+                     cyn, yel, cyn, nrm,
+                     cyn, yel, cyn, nrm,
+                     cyn, yel, cyn, nrm,
+                     cyn, yel, cyn, nrm );
+  write_to_output(d, "Enter Selection: ");
+
+  OLC_MODE(d) = MAILEDIT_OUTBOX;
+}
+
+void mailedit_disp_mail(struct descriptor_data *d)
+{
+  char att[15], gold[25];
+  int gold_amt;
+
+  get_char_colors(d->character);
+  clear_screen(d);
+  bool can_attach = TRUE;
+
+  if (count_recipients(OLC_MAIL(d)) > 1) can_attach = FALSE;
+
+  if (attachment_count(OLC_MAIL(d)->mail) > 0)
+    sprintf(att, "%s%d object%s", can_attach ? "@r" : "@y",  attachment_count(OLC_MAIL(d)->mail), attachment_count(OLC_MAIL(d)->mail) > 1 ? "s" : "");
+  else
+    sprintf(att, "<None>");
+
+  if (MAILEDIT_GOLD > 0) {
+    sprintf(gold, "%s%s coins", can_attach ? "@r" : "@y", add_commas(MAILEDIT_GOLD));
+  } else {
+    sprintf(gold, "<None>");
+  }
+
+  gold_amt = CONFIG_STAMP_COST + (attachment_count(OLC_MAIL(d)->mail) * CONFIG_OBJECT_COST);
+
+  write_to_output(d, "tbaMUD Mail Editor\r\n");
+  if (GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) {
+    write_to_output(d, "Current cost to send this mail: %s%d%s coins\r\n", yel, gold_amt, nrm);
+  } else {
+    write_to_output(d, "Current cost to send this mail: %sFree!%s\r\n", yel, nrm);
+  }
+  write_to_output(d, "%sA%s)%s Recipients  : %s%s\r\n"
+                     "%sB%s)%s Subject     : %s%s\r\n"
+                     "%sC%s)%s Urgency     : %s%s\r\n"
+                     "%sD%s)%s Attachments : %s%s\r\n"
+                     "%sE%s)%s Gold        : %s%s\r\n"
+                     "%sF%s)%s Gold Mode   : %s%s\r\n"
+                     "%sG%s)%s Body Text   : \r\n%s%s\r\n"
+                     "%sS%s)%s Send Mail\r\n"
+                     "%sX%s)%s Clear Mail data\r\n"
+                     "%sQ%s)%s Quit without sending\r\n",
+                     yel, cyn, nrm, yel, OLC_MAIL(d)->recipients ? recipient_list(OLC_MAIL(d)) : "<None!>",
+                     yel, cyn, nrm, yel, MAILEDIT_SUBJECT == NULL ? "- No Subject -" : MAILEDIT_SUBJECT,
+                     yel, cyn, nrm, yel, MAILEDIT_URGENT ? "@RUrgent!" : "Normal",
+                     yel, cyn, CONFIG_CAN_MAIL_OBJ ? nrm : gry, CONFIG_CAN_MAIL_OBJ ? yel : gry, att,
+                     yel, cyn, CONFIG_CAN_MAIL_GOLD ? nrm : gry, CONFIG_CAN_MAIL_GOLD ? yel : gry, gold,
+                     yel, cyn, nrm, yel, MAILEDIT_COD ? "Cash-on-Delivery (COD)" : "Send Gold",
+                     yel, cyn, nrm, yel, MAILEDIT_BODYTEXT == NULL ? "No Text" : MAILEDIT_BODYTEXT,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm);
+
+  write_to_output(d, "Enter Selection: ");
+
+  OLC_MODE(d) = MAILEDIT_MAILEDIT;
+}
+
+void mailedit_disp_recipients(struct descriptor_data *d)
+{
+  get_char_colors(d->character);
+  clear_screen(d);
+  write_to_output(d, "tbaMUD Mail Recipient Editor\r\n");
+  write_to_output(d, "Current Recipient List:\r\n");
+  write_to_output(d, "%s%s%s\r\n", yel, OLC_MAIL(d)->recipients ? recipient_list(OLC_MAIL(d)) : "<None!>", nrm);
+  write_to_output(d, "%sA%s)%s Add a Recipient\r\n"
+                     "%sB%s)%s Delete a Recipient\r\n"
+                     "%sC%s)%s Clear all Recipients\r\n"
+                     "%sQ%s)%s Quit (back to Editor)\r\n",
+                     yel, cyn, nrm,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm);
+  write_to_output(d, "Enter Selection: ");
+
+  OLC_MODE(d) = MAILEDIT_RECIP_MENU;
+}
+
+void mailedit_disp_attachments(struct descriptor_data *d)
+{
+  get_char_colors(d->character);
+  clear_screen(d);
+  write_to_output(d, "tbaMUD Mail Attachment Editor\r\n");
+  write_to_output(d, "Current Attached Objects:\r\n");
+  list_obj_to_char((OLC_MAIL(d)->mail)->attachment, d->character, 1, TRUE);
+  write_to_output(d, "\r\n");
+  write_to_output(d, "%sA%s)%s Add an Object\r\n"
+                     "%sB%s)%s Remove an Object\r\n"
+                     "%sC%s)%s Remove all Objects\r\n"
+                     "%sQ%s)%s Quit (back to Editor)\r\n",
+                     yel, cyn, nrm,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm,
+                     yel, cyn, nrm);
+  write_to_output(d, "Enter Selection: ");
+
+  OLC_MODE(d) = MAILEDIT_ATTACH_MENU;
+}
+
+void mailedit_parse(struct descriptor_data *d, char *arg)
+{
+  int i, num;
+  long mail_id, diff, gold;
+  struct mail_data *ml;
+  struct obj_data *obj;
+  char *oldtext = NULL;
+
+  switch (OLC_MODE(d)) {
+    case MAILEDIT_ASK_DRAFT:
+      switch (*arg) {
+      case 'y':
+      case 'Y':
+        /* Save the mail as a draft. */
+        save_as_draft(d->character, OLC_MAIL(d)->mail);
+        clear_mail_data(OLC_MAIL(d)->mail);
+        mailedit_disp_outbox(d);
+        return;
+      case 'n':
+      case 'N':
+        clear_mail_data(OLC_MAIL(d)->mail);
+        mailedit_disp_menu(d);
+        return;
+      default:
+        write_to_output(d, "Invalid choice!\r\n");
+        write_to_output(d, "Do you wish to save this mail as a draft? (Y/N): ");
+        return;
+      }
+      break;
+
+    case MAILEDIT_ASK_QUIT:
+      switch (*arg) {
+      case 'y':
+      case 'Y':
+        clear_mail_data(OLC_MAIL(d)->mail);
+        mailedit_disp_outbox(d);
+        return;
+      case 'n':
+      case 'N':
+        mailedit_disp_mail(d);
+        return;
+      default:
+        write_to_output(d, "Invalid choice!\r\n");
+        write_to_output(d, "Do you wish to quit and lose your changes? (Y/N): ");
+        return;
+      }
+      break;
+
+    case MAILEDIT_INBOX:
+      switch (*arg) {
+      case 'q':
+      case 'Q':
+        if (count_deleted(d->character) > 0) {
+
+          write_to_output(d, "You have mail marked for deletion.\r\n");
+          write_to_output(d, "Do you wish to purge all marked mails now? (Y/N)\r\n");
+          OLC_MODE(d) = MAILEDIT_PURGE_N_QUIT;
+          REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING);
+          return;
+        }
+         REMOVE_BIT_AR(PLR_FLAGS(d->character), PLR_MAILING);
+        cleanup_olc(d, CLEANUP_ALL);
+        return;
+      case 'c':
+      case 'C':
+        if ((GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) && (GET_GOLD(d->character) < CONFIG_STAMP_COST)) {
+          write_to_output(d, "Mails cost %d coins, and you can't afford that!\r\n", CONFIG_STAMP_COST);
+          mailedit_disp_menu(d);
+          return;
+		}
+        clear_mail_data(OLC_MAIL(d)->mail);
+        mailedit_disp_mail(d);
+        break;
+      case 'v':
+      case 'V':
+        write_to_output(d, "Which mail do you wish to view? : ");
+        OLC_MODE(d) = MAILEDIT_VIEW;
+        break;
+      case 'r':
+      case 'R':
+        if ((GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) && (GET_GOLD(d->character) < CONFIG_STAMP_COST)) {
+          write_to_output(d, "Mails cost %d coins, and you can't afford that!\r\n", CONFIG_STAMP_COST);
+          mailedit_disp_menu(d);
+          return;
+		}
+        write_to_output(d, "Which mail do you wish to reply to? : ");
+        OLC_MODE(d) = MAILEDIT_REPLY;
+        break;
+      case 'f':
+      case 'F':
+        if ((GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) && (GET_GOLD(d->character) < CONFIG_STAMP_COST)) {
+          write_to_output(d, "Mails cost %d coins, and you can't afford that!\r\n", CONFIG_STAMP_COST);
+          mailedit_disp_menu(d);
+          return;
+		}
+        write_to_output(d, "Which mail do you wish to forward? : ");
+        OLC_MODE(d) = MAILEDIT_FORWARD;
+        break;
+      case 'd':
+      case 'D':
+        write_to_output(d, "Which mail do you wish to delete? : ");
+        OLC_MODE(d) = MAILEDIT_DELETE;
+        break;
+      case 'e':
+      case 'E':
+        write_to_output(d, "Which mail do you wish to receive? : ");
+        OLC_MODE(d) = MAILEDIT_RECEIVE;
+        break;
+      case 'o':
+      case 'O':
+        mailedit_disp_outbox(d);
+        break;
+      default:
+        write_to_output(d, "Invalid Choice!\r\nEnter Selection : ");
+        break;
+      }
+      break;
+
+    case MAILEDIT_OUTBOX:
+      switch (*arg) {
+      case 'q':
+      case 'Q':
+        cleanup_olc(d, CLEANUP_ALL);
+        return;
+      case 'e':
+      case 'E':
+        if ((GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) && (GET_GOLD(d->character) < CONFIG_STAMP_COST)) {
+          write_to_output(d, "Mails cost %d coins, and you can't afford that!\r\n", CONFIG_STAMP_COST);
+          mailedit_disp_menu(d);
+          return;
+		}
+        write_to_output(d, "Which mail do you wish to edit? : ");
+        OLC_MODE(d) = MAILEDIT_OUTEDIT;
+        break;
+      case 'v':
+      case 'V':
+        write_to_output(d, "Which mail do you wish to view? : ");
+        OLC_MODE(d) = MAILEDIT_OUTVIEW;
+        break;
+      case 'i':
+      case 'I':
+        mailedit_disp_menu(d);
+        break;
+      case 'd':
+      case 'D':
+        write_to_output(d, "Which mail do you wish to delete? : ");
+        OLC_MODE(d) = MAILEDIT_OUTDELETE;
+        break;
+      default:
+        write_to_output(d, "Invalid Choice!\r\nEnter Selection : ");
+        break;
+      }
+      break;
+
+    case MAILEDIT_VIEW:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_inbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_view(d->character, mail_id);
+      write_to_output(d, "-- Press Enter to Continue! --\r\n");
+      OLC_MODE(d) = MAILEDIT_BACK_TO_MENU;
+      break;
+
+    case MAILEDIT_REPLY:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_inbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_menu(d);
+        return;
+      }
+      if ((ml = create_mail()) != NULL) {
+        load_mail(mail_id, ml);
+        copy_mail(OLC_MAIL(d)->mail, ml, MAIL_COPY_REPLY);
+        for (i=0; i<ML_ARRAY_MAX; i++)
+          ml->mail_flags[i]     = 0;
+        (OLC_MAIL(d)->mail)->mail_id   = NO_MAIL;
+        (OLC_MAIL(d)->mail)->sender    = GET_ID(d->character);
+        add_recipient(OLC_MAIL(d), ml->sender);
+        mailedit_disp_mail(d);
+      }
+      break;
+
+    case MAILEDIT_FORWARD:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_inbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_menu(d);
+        return;
+      }
+      if ((ml = create_mail()) != NULL) {
+        load_mail(mail_id, ml);
+        copy_mail(OLC_MAIL(d)->mail, ml, MAIL_COPY_FORWARD);
+        for (i=0; i<ML_ARRAY_MAX; i++)
+          ml->mail_flags[i]     = 0;
+        (OLC_MAIL(d)->mail)->mail_id   = NO_MAIL;
+        (OLC_MAIL(d)->mail)->sender    = GET_ID(d->character);
+        mailedit_disp_mail(d);
+      }
+      break;
+
+    case MAILEDIT_DELETE:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_inbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_delmark(d->character, mail_id);
+      mailedit_disp_mail(d);
+      break;
+
+    case MAILEDIT_RECEIVE:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_inbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_menu(d);
+        return;
+      }
+      if (mail_receive(d->character, mail_id))
+        write_to_output(d, "Mail received into your inventory.\r\n");
+      mailedit_disp_menu(d);
+      break;
+
+    case MAILEDIT_OUTEDIT:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_outbox(d);
+        return;
+      }
+      mail_id = get_id_by_outbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_outbox(d);
+        return;
+      }
+      if ((ml = create_mail()) != NULL) {
+        load_mail(mail_id, ml);
+        copy_mail(OLC_MAIL(d)->mail, ml, MAIL_COPY_NORMAL);
+        (OLC_MAIL(d)->mail)->sender    = GET_ID(d->character);
+        mailedit_disp_mail(d);
+      }
+      break;
+
+    case MAILEDIT_OUTVIEW:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_outbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_outbox(d);
+        return;
+      }
+      mail_view(d->character, mail_id);
+      write_to_output(d, "-- Press Enter to Continue! --\r\n");
+      OLC_MODE(d) = MAILEDIT_BACK_TO_MENU;
+      break;
+
+    case MAILEDIT_OUTDELETE:
+      num = atoi(arg);
+      if (num == 0) {
+        mailedit_disp_menu(d);
+        return;
+      }
+      mail_id = get_id_by_outbox_num(d->character, num);
+      if (mail_id == NO_MAIL) {
+        write_to_output(d, "Invalid mail number.\r\n");
+        mailedit_disp_outbox(d);
+        return;
+      }
+      mail_delmark(d->character, mail_id);
+      mailedit_disp_mail(d);
+      break;
+
+    case MAILEDIT_BACK_TO_MENU:
+      mailedit_disp_menu(d);
+      break;
+
+    case MAILEDIT_RECIP_MENU:
+      switch (*arg) {
+        case 'a':
+        case 'A':
+          /* Mail with attachments can only have one recipient */
+          if (count_recipients(OLC_MAIL(d)) > 0) {
+            if (((OLC_MAIL(d)->mail)->attachment) || ((OLC_MAIL(d)->mail)->coins > 0 && !IS_SET_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_COD))) {
+              write_to_output(d, "Sorry, mail with attachments cannot be sent to more than one person!\r\n");
+              mailedit_disp_recipients(d);
+              return;
+            }
+          }
+          write_to_output(d, "Enter a player name to add: ");
+          OLC_MODE(d) = MAILEDIT_ADD_RECIP;
+          break;
+        case 'b':
+        case 'B':
+          write_to_output(d, "Enter a player name to remove: ");
+          OLC_MODE(d) = MAILEDIT_DEL_RECIP;
+          break;
+        case 'c':
+        case 'C':
+          write_to_output(d, "Are you sure you wish to remove ALL recipients? (Y/N): ");
+          OLC_MODE(d) = MAILEDIT_CLR_RECIP;
+          break;
+        case 'q':
+        case 'Q':
+          mailedit_disp_mail(d);
+          break;
+      }
+      break;
+
+    case MAILEDIT_ADD_RECIP:
+      /* check 'special cases' (mail groups) */
+      if ((mail_id = get_mail_group_by_name(arg)) == MAIL_TO_NOBODY) {
+        if ((mail_id = get_id_by_name(arg)) < 0 || !mail_recip_ok(arg)) {
+          write_to_output(d, "No one by that name is registered here!\r\n");
+          mailedit_disp_recipients(d);
+          return;
+        }
+      }
+      if (mail_id == MAIL_TO_ALL && GET_LEVEL(d->character) < CONFIG_MIN_SEND_TO_ALL) {
+        write_to_output(d, "Sorry, you don't have sufficient access to send to 'all'\r\n");
+        mailedit_disp_recipients(d);
+        return;
+      }
+      add_recipient(OLC_MAIL(d), mail_id);
+      mailedit_disp_recipients(d);
+      break;
+
+    case MAILEDIT_DEL_RECIP:
+      if ((mail_id = get_id_by_name(arg)) < 0 || !mail_recip_ok(arg)) {
+        write_to_output(d, "No one by that name is registered here!\r\n");
+        mailedit_disp_recipients(d);
+        return;
+      }
+      remove_recipient(OLC_MAIL(d), mail_id);
+      mailedit_disp_recipients(d);
+      break;
+
+    case MAILEDIT_CLR_RECIP:
+      switch (*arg) {
+        case 'y':
+        case 'Y':
+          clear_recipients(OLC_MAIL(d));
+          mailedit_disp_recipients(d);
+          break;
+        case 'n':
+        case 'N':
+          mailedit_disp_recipients(d);
+          break;
+        default : write_to_output(d, "Invalid choice!\r\nAre you sure you wish to remove ALL recipients? (Y/N): ");
+                  break;
+      }
+      break;
+
+    case MAILEDIT_ATTACH_MENU:
+      switch (*arg) {
+        case 'a':
+        case 'A':
+          /* Mail with attachments can only have one recipient */
+          if (count_recipients(OLC_MAIL(d)) > 1) {
+            write_to_output(d, "Sorry, mail with multiple recipients cannot have attachments!\r\n");
+            mailedit_disp_attachments(d);
+            return;
+          }
+          if ((d->character)->carrying == NULL) {
+            write_to_output(d, "Your inventory seems to be empty - you cannot attach anything.\r\n");
+            mailedit_disp_attachments(d);
+            return;
+          }
+          list_attachments_numbered((d->character)->carrying, d->character);
+          write_to_output(d, "Enter a object to add: ");
+          OLC_MODE(d) = MAILEDIT_ADD_ATTACH;
+          break;
+        case 'b':
+        case 'B':
+          if ((OLC_MAIL(d)->mail)->attachment == NULL) {
+            write_to_output(d, "There are no attachments - you cannot remove anything.\r\n");
+            mailedit_disp_attachments(d);
+            return;
+          }
+          list_attachments_numbered((OLC_MAIL(d)->mail)->attachment, d->character);
+          write_to_output(d, "Enter an object to remove: ");
+          OLC_MODE(d) = MAILEDIT_DEL_ATTACH;
+          break;
+        case 'c':
+        case 'C':
+          write_to_output(d, "Are you sure you wish to remove ALL objects? (Y/N): ");
+          OLC_MODE(d) = MAILEDIT_CLR_ATTACH;
+          break;
+        case 'q':
+        case 'Q':
+          mailedit_disp_mail(d);
+          break;
+      }
+      break;
+
+    case MAILEDIT_ADD_ATTACH:
+      num = atoi(arg);
+      if ((obj = get_attachment_numbered(d->character, (d->character)->carrying, num)) == NULL) {
+        write_to_output(d, "That object number is not in your inventory\r\n");
+        mailedit_disp_attachments(d);
+        return;
+      }
+      obj_from_char(obj);
+      obj_to_mail(obj, OLC_MAIL(d)->mail);
+      mailedit_disp_attachments(d);
+      break;
+
+    case MAILEDIT_DEL_ATTACH:
+      num = atoi(arg);
+      if ((obj = get_attachment_numbered(d->character, (OLC_MAIL(d)->mail)->attachment, num)) == NULL) {
+        write_to_output(d, "That object number is not attached.\r\n");
+        mailedit_disp_attachments(d);
+        return;
+      }
+      obj_from_mail(obj);
+      obj_to_char(obj, d->character);
+      mailedit_disp_attachments(d);
+      break;
+
+    case MAILEDIT_CLR_ATTACH:
+      switch (*arg) {
+        case 'y':
+        case 'Y':
+          while ((OLC_MAIL(d)->mail)->attachment) {
+            obj = (OLC_MAIL(d)->mail)->attachment;
+            obj_from_mail(obj);
+            obj_to_char(obj, d->character);
+          }
+          mailedit_disp_attachments(d);
+          break;
+        case 'n':
+        case 'N':
+          mailedit_disp_attachments(d);
+          break;
+        default : write_to_output(d, "Invalid choice!\r\nAre you sure you wish to remove ALL attachments? (Y/N): ");
+                  break;
+      }
+      break;
+
+    case MAILEDIT_GET_GOLD:
+      gold = atol(arg);
+      diff = (gold - (OLC_MAIL(d)->mail)->coins);
+      if (diff > GET_GOLD(d->character)) {
+        write_to_output(d, "@RYou don't have that much gold!@n\r\n");
+        mailedit_disp_mail(d);
+        return;
+      }
+      GET_GOLD(d->character) -= diff;
+      (OLC_MAIL(d)->mail)->coins = gold;
+      mailedit_disp_mail(d);
+      break;
+
+    case MAILEDIT_GET_SUBJECT:
+      if ((OLC_MAIL(d)->mail)->subject)
+        free ((OLC_MAIL(d)->mail)->subject);
+      (OLC_MAIL(d)->mail)->subject = strdup(arg);
+      mailedit_disp_mail(d);
+      break;
+
+    case MAILEDIT_MAILEDIT:
+      switch (*arg) {
+      case 'q':
+      case 'Q':
+        if (CONFIG_DRAFTS_ALLOWED) {
+          write_to_output(d, "Do you wish to save this mail as a draft? (Y/N): ");
+          OLC_MODE(d) = MAILEDIT_ASK_DRAFT;
+        } else {
+          write_to_output(d, "Do you wish to quit and lose your changes? (Y/N): ");
+          OLC_MODE(d) = MAILEDIT_ASK_QUIT;
+        }
+        break;
+      case 'a':
+      case 'A':
+        mailedit_disp_recipients(d);
+        break;
+      case 'b':
+      case 'B':
+        write_to_output(d, "Enter a subject for this mail: ");
+        OLC_MODE(d) = MAILEDIT_GET_SUBJECT;
+        break;
+      case 'c':
+      case 'C':
+        TOGGLE_BIT_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_URGENT);
+        mailedit_disp_mail(d);
+        break;
+      case 'd':
+      case 'D':
+        if (CONFIG_CAN_MAIL_OBJ) {
+          mailedit_disp_attachments(d);
+        } else {
+          write_to_output(d, "@RSorry, object attachments are disabled!@n\r\n");
+          mailedit_disp_mail(d);
+        }
+        break;
+      case 'e':
+      case 'E':
+        if (CONFIG_CAN_MAIL_GOLD) {
+          write_to_output(d, "Enter a number of gold coins: ");
+          OLC_MODE(d) = MAILEDIT_GET_GOLD;
+        } else {
+          write_to_output(d, "@RSorry, gold attachments are disabled!@n\r\n");
+          mailedit_disp_mail(d);
+        }
+        break;
+      case 'f':
+      case 'F':
+        /* Flicking between COD and 'send money', we need to give/take gold from the player */
+        if (IS_SET_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_COD) && ((OLC_MAIL(d)->mail)->coins > 0)) {
+          diff = (OLC_MAIL(d)->mail)->coins;
+          if (diff > GET_GOLD(d->character)) {
+            write_to_output(d, "@RYou don't have enough gold to do that!@n\r\n");
+            mailedit_disp_mail(d);
+            return;
+          }
+          GET_GOLD(d->character) -= diff;
+		} else if (!IS_SET_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_COD) && ((OLC_MAIL(d)->mail)->coins > 0)) {
+          diff = (OLC_MAIL(d)->mail)->coins;
+          GET_GOLD(d->character) += diff;
+		}
+        TOGGLE_BIT_AR((OLC_MAIL(d)->mail)->mail_flags, MAIL_COD);
+        mailedit_disp_mail(d);
+        break;
+      case 'g':
+      case 'G':
+        OLC_MODE(d) = MAILEDIT_GET_BODYTEXT;
+        send_editor_help(d);
+        write_to_output(d, "Enter the main body text for this mail:\r\n\r\n");
+        if ((OLC_MAIL(d)->mail)->body) {
+          write_to_output(d, "%s", (OLC_MAIL(d)->mail)->body);
+          oldtext = strdup((OLC_MAIL(d)->mail)->body);
+        }
+        string_write(d, &(OLC_MAIL(d)->mail)->body, MAX_MAIL_SIZE, 0, oldtext);
+        break;
+      case 's':
+      case 'S':
+        if (GET_LEVEL(d->character) < CONFIG_FREE_MAIL_LEVEL) {
+          gold = CONFIG_STAMP_COST + (attachment_count(OLC_MAIL(d)->mail) * CONFIG_OBJECT_COST);
+        } else {
+          gold = 0;
+        }
+        if (gold > 0 && GET_GOLD(d->character) < gold ) {
+          write_to_output(d, "This mail costs %ld coins, and you can't afford that!\r\n", gold );
+          mailedit_disp_mail(d);
+          return;
+		}
+        (OLC_MAIL(d)->mail)->sender = GET_ID(d->character);
+        if (perform_send_edited(d->character, OLC_MAIL(d)) == FALSE) {
+          write_to_output(d, "@RERROR: Unable to send Mail: Please tell an Imm!@n\r\n");
+          /* Sending failed - return to editor, so they can choose to save as draft */
+          mailedit_disp_mail(d);
+          return;
+        }
+        /* Sending was successful - clean up */
+		if (gold) GET_GOLD(d->character) -= gold;
+        clear_mail_data(OLC_MAIL(d)->mail);
+        clear_recipients(OLC_MAIL(d));
+        write_to_output(d, "Sending of mail successful!  Press Enter to continue.\r\n");
+        OLC_MODE(d) = MAILEDIT_BACK_TO_MENU;
+        break;
+      case 'x':
+      case 'X':
+        clear_mail_data(OLC_MAIL(d)->mail);
+        mailedit_disp_mail(d);
+        break;
+      default:
+        write_to_output(d, "Invalid Choice!\r\nEnter Selection : ");
+        break;
+      }
+      break;
+
+    case MAILEDIT_PURGE_N_QUIT:
+      switch (*arg) {
+        case 'y':
+        case 'Y':
+          num = purge_marked_mail(d->character);
+          if (num > 0) {
+            write_to_output(d, "%d deleted mail%s ha%s been purged.", num, num == 1 ? "" : "s", num == 1 ? "s" : "ve");
+          }
+          cleanup_olc(d, CLEANUP_ALL);
+          break;
+        case 'n':
+        case 'N':
+          cleanup_olc(d, CLEANUP_ALL);
+          break;
+        default : write_to_output(d, "Invalid choice!\r\nDo you wish to purge all marked mails now? (Y/N): ");
+                  break;
+      }
+      break;
+
+    default:
+      write_to_output(d, "Sorry - There appears to be a problem, returning to inbox.\r\n");
+      log("SYSERR: mailedit: Invalid submode (%d)", OLC_MODE(d));
+      mailedit_disp_menu(d);
+      break;
+  }
+}
+
+void mailedit_string_cleanup(struct descriptor_data *d, int terminator)
+{
+  switch (OLC_MODE(d)) {
+  case MAILEDIT_GET_BODYTEXT:
+    mailedit_disp_mail(d);
+    break;
+  }
+}
+
+
diff --git a/src/modify.c b/src/modify.c
index 4c69a78..362687b 100644
--- a/src/modify.c
+++ b/src/modify.c
@@ -196,6 +196,7 @@ void string_add(struct descriptor_data *d, char *str)
       { CON_HEDIT, hedit_string_cleanup },
       { CON_QEDIT  , qedit_string_cleanup },
       { CON_IBTEDIT, ibtedit_string_cleanup },
+      { CON_MAILEDIT , mailedit_string_cleanup },
       { -1, NULL }
     };
 
@@ -222,9 +223,12 @@ static void playing_string_cleanup(struct descriptor_data *d, int action)
 {
   if (PLR_FLAGGED(d->character, PLR_MAILING)) {
     if (action == STRINGADD_SAVE && *d->str) {
-      store_mail(d->mail_to, GET_IDNUM(d->character), *d->str);
-      write_to_output(d, "Message sent!\r\n");
-      notify_if_playing(d->character, d->mail_to);
+      if (mail_from_player(d->mail_to, GET_IDNUM(d->character), *d->str)) {
+       write_to_output(d, "Message sent!\r\n");
+       notify_if_playing(d->character, d->mail_to);
+      } else {
+        write_to_output(d, "Error: Mail could not be sent.  Please tell an Imm\r\n");
+      }
     } else
       write_to_output(d, "Mail aborted.\r\n");
       free(*d->str);
diff --git a/src/oasis.c b/src/oasis.c
index f6d5b9a..0a42b2b 100644
--- a/src/oasis.c
+++ b/src/oasis.c
@@ -48,7 +48,7 @@ static struct olc_scmd_info_t {
 */
 
 /* Global variables defined here, used elsewhere */
-const char *nrm, *grn, *cyn, *yel;
+const char *nrm, *grn, *cyn, *yel, *gry;
 
 /* Internal Function prototypes  */
 static void free_config(struct config_data *data);
@@ -70,6 +70,7 @@ void get_char_colors(struct char_data *ch)
   grn = CCGRN(ch, C_NRM);
   cyn = CCCYN(ch, C_NRM);
   yel = CCYEL(ch, C_NRM);
+  gry = CBBLK(ch, C_NRM);
 }
 
 /* This procedure frees up the strings and/or the structures attatched to a
diff --git a/src/oasis.h b/src/oasis.h
index 55100dd..1f94211 100644
--- a/src/oasis.h
+++ b/src/oasis.h
@@ -98,6 +98,7 @@ struct oasis_olc_data {
   struct prefs_data *prefs;         /* used for 'prefedit'      */
   struct ibt_data *ibt;             /* used for 'ibtedit'       */
   struct house_control_data *house; /* used for 'hsedit'        */
+  struct mail_edit_data *mail;      /* used for Mudmail editor  */
   int script_mode;
   int trigger_position;
   int item_type;
@@ -106,7 +107,7 @@ struct oasis_olc_data {
 };
 
 /* Exported globals. */
-extern const char *nrm, *grn, *cyn, *yel;
+extern const char *nrm, *grn, *cyn, *yel, *gry;
 
 /* Descriptor access macros. */
 #define OLC(d)         ((d)->olc)
@@ -131,6 +132,7 @@ extern const char *nrm, *grn, *cyn, *yel;
 #define OLC_PREFS(d)   (OLC(d)->prefs)    /**< Preferences structure */
 #define OLC_IBT(d)     (OLC(d)->ibt)      /**< IBT (idea/bug/typo) structure */
 #define OLC_HOUSE(d)   (OLC(d)->house)    /**< Player-Owned House/Shop structure */
+#define OLC_MAIL(d)    (OLC(d)->mail)     /**< Mudmail structure.   */
 /* Other macros. */
 #define OLC_EXIT(d)		(OLC_ROOM(d)->dir_option[OLC_VAL(d)])
 
@@ -333,6 +335,7 @@ extern const char *nrm, *grn, *cyn, *yel;
 #define CEDIT_MENU			14
 #define CEDIT_WELC_MESSG		15
 #define CEDIT_START_MESSG		16
+#define CEDIT_MUDMAIL_OPTIONS_MENU	17
 
 /* Numerical responses. */
 #define CEDIT_NUMERICAL_RESPONSE  20
@@ -373,6 +376,13 @@ extern const char *nrm, *grn, *cyn, *yel;
 #define CEDIT_MAP_OPTION          55
 #define CEDIT_MAP_SIZE            56
 #define CEDIT_MINIMAP_SIZE        57
+#define CEDIT_STAMP_COST          58
+#define CEDIT_OBJECT_COST         59
+#define CEDIT_DRAFT_TIMEOUT       60
+#define CEDIT_MIN_MAIL_LEVEL      61
+#define CEDIT_MIN_FREE_LEVEL      62
+#define CEDIT_MAIL_ANYWHERE       63
+#define CEDIT_MAIL_ALL_PLAYERS    64
 
 /* Hedit Submodes of connectedness. */
 #define HEDIT_CONFIRM_SAVESTRING        0
@@ -416,6 +426,12 @@ void clear_screen(struct descriptor_data *);
 int can_edit_zone(struct char_data *ch, zone_rnum rnum);
 ACMD(do_oasis);
 
+/* public functions from mailedit.c */
+ACMD(do_mail);
+ACMD(do_mailedit);
+void mailedit_string_cleanup(struct descriptor_data *d, int terminator);
+void mailedit_parse(struct descriptor_data *d, char *arg);
+
 /* public functions from medit.c */
 void medit_setup_existing(struct descriptor_data *d, int rnum);
 void medit_save_internally(struct descriptor_data *d);
diff --git a/src/spec_assign.c b/src/spec_assign.c
index d4d7e91..146239f 100644
--- a/src/spec_assign.c
+++ b/src/spec_assign.c
@@ -109,16 +109,6 @@ void assign_mobiles(void)
 
   ASSIGNMOB(3105, mayor);
 
-  ASSIGNMOB(110, postmaster);
-  ASSIGNMOB(1201, postmaster);
-  ASSIGNMOB(3010, postmaster);
-  ASSIGNMOB(10412, postmaster);
-  ASSIGNMOB(10719, postmaster);
-  ASSIGNMOB(25710, postmaster);
-  ASSIGNMOB(27164, postmaster);
-  ASSIGNMOB(30128, postmaster);
-  ASSIGNMOB(31510, postmaster);
-
   ASSIGNMOB(1200, receptionist);
   ASSIGNMOB(3005, receptionist);
   ASSIGNMOB(5404, receptionist);
@@ -181,7 +171,6 @@ struct spec_func_data spec_func_list[] = {
   {"Fido",               fido },
   {"Janitor",            janitor },
   {"Cityguard",          cityguard },
-  {"Postmaster",         postmaster },
   {"Receptionist",       receptionist },
   {"Cryogenicist",       cryogenicist},
   {"Bulletin Board",     gen_board },
diff --git a/src/structs.h b/src/structs.h
index f8b9a08..18e2839 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -92,8 +92,9 @@
 #define ROOM_OLC           14   /**< (R) Modifyable/!compress */
 #define ROOM_BFS_MARK      15   /**< (R) breath-first srch mrk */
 #define ROOM_WORLDMAP      16   /**< World-map style maps here */
+#define ROOM_MAIL          17   /**< Mudmail can be sent from here */
 /** The total number of Room Flags */
-#define NUM_ROOM_FLAGS    17
+#define NUM_ROOM_FLAGS    18
 
 /* Zone info: Used in zone_data.zone_flags */
 #define ZONE_CLOSED       0  /**< Zone is closed - players cannot enter */
@@ -222,9 +223,10 @@
 #define MOB_NOBASH         16   /**< Mob can't be bashed (e.g. trees) */
 #define MOB_NOBLIND        17   /**< Mob can't be blinded */
 #define MOB_NOKILL         18   /**< Mob can't be attacked */
-#define MOB_NOTDEADYET     19   /**< (R) Mob being extracted */
+#define MOB_MAILMAN	       19   /**< Mob stands in room with MAIL flag */
+#define MOB_NOTDEADYET     20   /**< (R) Mob being extracted */
 
-#define NUM_MOB_FLAGS      19
+#define NUM_MOB_FLAGS      20
 
 /* Preference flags: used by char_data.player_specials.pref */
 #define PRF_BRIEF         0   /**< Room descs won't normally be shown */
@@ -358,10 +360,11 @@
 #define CON_PREFEDIT     29 /**< OLC mode - preference edit */
 #define CON_IBTEDIT      30 /**< OLC mode - idea/bug/typo edit */
 #define CON_HSEDIT       31 /**< OLC mode - house editor */
+#define CON_MAILEDIT     32 /**< OLC mode - Mudmail editor */
 
 /* OLC States range - used by IS_IN_OLC and IS_PLAYING */
 #define FIRST_OLC_STATE CON_OEDIT     /**< The first CON_ state that is an OLC */
-#define LAST_OLC_STATE  CON_HSEDIT    /**< The last CON_ state that is an OLC  */
+#define LAST_OLC_STATE  CON_MAILEDIT  /**< The last CON_ state that is an OLC  */
 
 /* Character equipment positions: used as index for char_data.equipment[] */
 /* NOTE: Don't confuse these constants with the ITEM_ bitvectors
@@ -758,6 +761,7 @@ struct obj_data
   struct obj_data *next_content;  /**< For 'contains' lists   */
   struct obj_data *next;          /**< For the object list */
   struct char_data *sitting_here; /**< For furniture, who is sitting in it */
+  struct mail_data *in_mail;      /**< Which mail object is attached to    */
 };
 
 /** Instance info for an object that gets saved to disk.
@@ -1010,6 +1014,8 @@ struct mob_special_data
   byte default_pos;   /**< Default position (standing, sleeping, etc.) */
   byte damnodice;     /**< The number of dice to roll for damage */
   byte damsizedice;   /**< The size of each die rolled for damage. */
+
+  struct mail_edit_data *ml_list;  /**< Mail info for sending from mobs by script */
 };
 
 /** An affect structure. */
@@ -1385,6 +1391,22 @@ struct autowiz_data
   int min_wizlist_lev; /**< Minimun level to show on wizlist.  */
 };
 
+/** The Mail System options. */
+struct mail_config {
+  int mail_allowed;           /* Is mudmail allowed? (to disable whole mudmail system) Yes         */
+  int objects_allowed;        /* object mailing allowed                                Yes         */
+  int gold_allowed;           /* gold mailing allowed?                                 Yes         */
+  int stamp_cost;             /* Stamp Cost                                            150 coins   */
+  int object_cost;            /* Cost per object for each attachment                   30 coins    */
+  int min_level;              /* Min level that can mail                               1           */
+  int min_free_level;         /* Min level for free mail                               Immortal    */
+  int allow_drafts;           /* Can players save draft mudmails?                      Yes         */
+  int draft_timeout;          /* No. of days a draft mail can stay in the outbox       28 days     */
+  int safe_mailing;           /* Can players be attacked or stolen from while mailing? Yes         */
+  int min_mail_anywhere;      /* Min level that can send mail from anywhere?           Immortal    */
+  int min_send_to_all;        /* Min level that can send mail to all players?          Implementor */
+};
+
 /**
  Main Game Configuration Structure.
  Global variables that can be changed within the game are held within this
@@ -1408,6 +1430,8 @@ struct config_data
   struct game_operation operation;
   /** Autowiz specific settings, like turning it on and minimum level */
   struct autowiz_data autowiz;
+  /** Mudmail configuration */
+  struct mail_config mail;
 };
 
 #ifdef MEMORY_DEBUG
diff --git a/src/util/Makefile.in b/src/util/Makefile.in
index 5b2f65b..7f7d57b 100755
--- a/src/util/Makefile.in
+++ b/src/util/Makefile.in
@@ -26,10 +26,11 @@ default: all
 all: $(BINDIR)/asciipasswd \
 	$(BINDIR)/autowiz \
 	$(BINDIR)/plrtoascii \
+	$(BINDIR)/rebuildIndex \
+	$(BINDIR)/rebuildMailIndex \
 	$(BINDIR)/shopconv \
 	$(BINDIR)/sign \
 	$(BINDIR)/split \
-	$(BINDIR)/rebuildIndex \
 	$(BINDIR)/wld2html \
 	$(BINDIR)/webster 
 
@@ -39,6 +40,10 @@ autowiz: $(BINDIR)/autowiz
 
 plrtoascii: $(BINDIR)/plrtoascii
 
+rebuildIndex: $(BINDIR)/rebuildIndex
+
+rebuildMailIndex: $(BINDIR)/rebuildMailIndex
+
 shopconv: $(BINDIR)/shopconv
 
 sign: $(BINDIR)/sign
@@ -49,11 +54,6 @@ wld2html: $(BINDIR)/wld2html
 
 webster: $(BINDIR)/webster
 
-rebuildIndex: $(BINDIR)/rebuildIndex
-
-$(BINDIR)/rebuildIndex: rebuildAsciiIndex.c
-	$(CC) $(CFLAGS) -o $(BINDIR)/rebuildIndex rebuildAsciiIndex.c
-
 $(BINDIR)/asciipasswd: asciipasswd.c
 	$(CC) $(CFLAGS) -o $(BINDIR)/asciipasswd asciipasswd.c @CRYPTLIB@
 
@@ -63,6 +63,12 @@ $(BINDIR)/autowiz: autowiz.c
 $(BINDIR)/plrtoascii: plrtoascii.c
 	$(CC) $(CFLAGS) -o $(BINDIR)/plrtoascii plrtoascii.c
 
+$(BINDIR)/rebuildIndex: rebuildAsciiIndex.c
+	$(CC) $(CFLAGS) -o $(BINDIR)/rebuildIndex rebuildAsciiIndex.c
+
+$(BINDIR)/rebuildMailIndex: rebuildMailIndex.c
+	$(CC) $(CFLAGS) -o $(BINDIR)/rebuildMailIndex rebuildMailIndex.c
+
 $(BINDIR)/shopconv: shopconv.c
 	$(CC) $(CFLAGS) -o $(BINDIR)/shopconv shopconv.c
 
diff --git a/src/util/rebuildAsciiIndex.c b/src/util/rebuildAsciiIndex.c
index 6954c67..764bbb0 100644
--- a/src/util/rebuildAsciiIndex.c
+++ b/src/util/rebuildAsciiIndex.c
@@ -4,10 +4,10 @@
 *  All Rights Reserved                                                    *
 ************************************************************************* */
 
-#include <stdio.h> 
-#include <dirent.h> 
-#include <sys/stat.h> 
-#include <sys/types.h> 
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 #include <string.h>
 
 #define READ_SIZE 256
@@ -19,19 +19,19 @@ long atol(const char *str);
 void walkdir(FILE* index_file, char *dir);
 int get_line(FILE *fl, char *buf);
 
-int main(int argc, char** argv) 
-{ 
+int main(int argc, char** argv)
+{
  	FILE *index_file;
-  if ( argc == 1 )	{ 
-	  printf("Usage: %s indexfile\n",argv[0]); 
-	  return 0; 
- 	} 
+  if ( argc == 1 )	{
+	  printf("Usage: %s indexfile\n",argv[0]);
+	  return 0;
+ 	}
  	if (!(index_file = fopen(argv[1], "w"))) {
     perror("error opening index file");
     return 1;
   }
-	walkdir(index_file, "."); 
-  
+	walkdir(index_file, ".");
+
   fprintf(index_file, "~\n");
   fclose(index_file);
  	return 0;
@@ -54,12 +54,12 @@ char *parsename(char *filename) {
 char *findLine(FILE *plr_file, char *tag) {
 	static char line[5000];
 	rewind(plr_file);
-	
+
 	while (get_line(plr_file, line)) {
 		if(!strncmp(tag, line, strlen(tag))) {
 			return line+strlen(tag);
 		}
-	}	
+	}
 	return NULL;
 }
 
@@ -75,7 +75,7 @@ int parseadminlevel(FILE *plr_file, int level) {
 	char *fromFile = findLine(plr_file, "Admn:");
 	if (fromFile != NULL)
 		return atoi(fromFile);
-	
+
 	if (level >= 30)
 		return level-30;
 	else
@@ -88,36 +88,36 @@ long parselast(FILE *plr_file) {
 
 
 void walkdir(FILE *index_file, char *dir) {
- 	char filename_qfd[1000] ; 
-	struct dirent *dp; 
- 	DIR *dfd; 
- 
- 	if ((dfd = opendir(dir)) == NULL) 
- 	{ 
-	  fprintf(stderr, "Can't open %s\n", dir); 
-	  return; 
- 	} 
- 	while ((dp = readdir(dfd)) != NULL) 
- 	{ 
-	  struct stat stbuf ; 
-	  sprintf( filename_qfd , "%s/%s",dir,dp->d_name) ; 
-	  if( stat(filename_qfd,&stbuf ) == -1 ) { 
-   		fprintf(stdout, "Unable to stat file: %s\n",filename_qfd) ; 
-   		continue ; 
-  	} 
- 
-  	if ( ( stbuf.st_mode & S_IFMT ) == S_IFDIR ) { 
+ 	char filename_qfd[1000] ;
+	struct dirent *dp;
+ 	DIR *dfd;
+
+ 	if ((dfd = opendir(dir)) == NULL)
+ 	{
+	  fprintf(stderr, "Can't open %s\n", dir);
+	  return;
+ 	}
+ 	while ((dp = readdir(dfd)) != NULL)
+ 	{
+	  struct stat stbuf ;
+	  sprintf( filename_qfd , "%s/%s",dir,dp->d_name) ;
+	  if( stat(filename_qfd,&stbuf ) == -1 ) {
+   		fprintf(stdout, "Unable to stat file: %s\n",filename_qfd) ;
+   		continue ;
+  	}
+
+  	if ( ( stbuf.st_mode & S_IFMT ) == S_IFDIR ) {
 			if (!strcmp(".", dp->d_name) || !strcmp("..", dp->d_name))
-   			continue; 
-   		
+   			continue;
+
    		walkdir(index_file, filename_qfd);
-  	} else { 
+  	} else {
 			char *name = parsename(dp->d_name);
-			
+
 			if (name != NULL) {
   			FILE *plr_file = fopen(filename_qfd, "r");
  				long id = parseid(plr_file);
- 			
+
   			int level = parselevel(plr_file);
  				int adminlevel = parseadminlevel(plr_file, level);
  				if (level > 30)
@@ -125,11 +125,11 @@ void walkdir(FILE *index_file, char *dir) {
  				long last = parselast(plr_file);
 
  				fprintf(index_file, "%ld %s %d %d 0 %ld\n", id, name, level, adminlevel, last);
-        
+
         fclose(plr_file);
   		}
-  	} 
- 	} 
+  	}
+ 	}
 }
 
 int get_line(FILE *fl, char *buf)
diff --git a/src/util/rebuildMailIndex.c b/src/util/rebuildMailIndex.c
new file mode 100755
index 0000000..f031455
--- /dev/null
+++ b/src/util/rebuildMailIndex.c
@@ -0,0 +1,299 @@
+/* ************************************************************************
+*  file:  rebuildMailIndex.c                               Part of tbaMUD *
+*  Copyright (C) 1990, 2010 - see 'license.doc' for complete information. *
+*  All Rights Reserved                                                    *
+************************************************************************* */
+
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include <string.h>
+
+#define READ_SIZE 256
+
+#define FLAG(n) (1 << (n))
+
+#ifndef FALSE
+typedef enum _boolean_type {
+  FALSE=0, TRUE
+} bool;
+#endif
+
+/* 128-bit flag defines (from utils.h) */
+#define Q_FIELD(x)  ((int) (x) / 32)
+#define Q_BIT(x)    (1 << ((x) % 32))
+#define IS_SET_AR(var, bit)       ((var)[Q_FIELD(bit)] & Q_BIT(bit))
+#define SET_BIT_AR(var, bit)      ((var)[Q_FIELD(bit)] |= Q_BIT(bit))
+
+/* 32-bit flag defines (from utils.h) */
+#define IS_SET(flag,bit)  ((flag) & (bit))
+#define SET_BIT(var,bit)  ((var) |= (bit))
+
+int atoi(const char *str);
+long atol(const char *str);
+
+/* Mail index flags - taken from mail.h */
+#define MINDEX_DELETED   FLAG(0)  /* Mail has been marked for deletion     */
+#define MINDEX_URGENT    FLAG(1)  /* Mail is flagged as urgent by sender   */
+#define MINDEX_HAS_OBJ   FLAG(2)  /* Mail has an attached object           */
+#define MINDEX_HAS_GOLD  FLAG(3)  /* Mail contains some gold coins         */
+#define MINDEX_IS_COD    FLAG(4)  /* Mail requires some gold coins         */
+#define MINDEX_FROM_MOB  FLAG(5)  /* Mail has been sent by using scripts   */
+#define MINDEX_READ      FLAG(6)  /* Mail has been viewed but not received */
+#define MINDEX_DRAFT     FLAG(7)  /* Mail is an unsent draft copy          */
+
+/* Mail Flags - taken from mail.h */
+#define MAIL_DELETED  1  /* Marks mail for deletion with next purge */
+#define MAIL_URGENT   2  /* This mail is flagged as urgent?         */
+#define MAIL_COD      3  /* Means coins amount is required payment  */
+#define MAIL_FROM_MOB 4  /* Specifies that 'sender' is a mob vnum   */
+#define MAIL_READ     5  /* Mail has been read by recipient         */
+#define MAIL_DRAFT    6  /* Mail is a draft (not yet sent)          */
+
+void walkdir(FILE* index_file, char *dir);
+int get_line(FILE *fl, char *buf);
+long asciiflag_conv(char *flag);
+int sprintascii(char *out, long bits);
+
+int main(int argc, char** argv)
+{
+  FILE *index_file;
+  if ( argc == 1 )	{
+    printf("Usage: %s indexfile\n",argv[0]);
+    return 0;
+  }
+  if (!(index_file = fopen(argv[1], "w"))) {
+    perror("error opening index file");
+    return 1;
+  }
+
+  fprintf(index_file, "# tbaMUD mail index\n");
+  fprintf(index_file, "# Format: <ID> <flags> <sender ID/vnum> <recipient ID> <time> <subject>\n");
+  fprintf(index_file, "# For 'No Subject', use (null)\n");
+
+  walkdir(index_file, ".");
+
+  fprintf(index_file, "~\n");
+  fclose(index_file);
+  return 0;
+}
+
+/* check that filename is a valid mail file, else return NULL */
+char *parsefilename(char *filename) {
+  static char copy[1024];
+  char *extension;
+
+  strcpy(copy, filename);
+  extension = strchr(copy, '.');
+  if (extension == NULL) {
+    return NULL;
+  }
+  if (strcmp(".ml", extension)) {
+    return NULL;
+  }
+  *extension = '\0';
+  return copy;
+}
+
+/* Search file for a specific tag line, return text after tag, or NULL if not found */
+char *findLine(FILE *plr_file, char *tag) {
+	static char line[5000];
+	rewind(plr_file);
+
+	while (get_line(plr_file, line)) {
+		if(!strncmp(tag, line, strlen(tag))) {
+			return line+strlen(tag);
+		}
+	}
+	return NULL;
+}
+/* Search file for mail ID and convert to long */
+long parse_mailid(FILE *plr_file) {
+	return atol(findLine(plr_file, "MlID:"));
+}
+
+/* Search file for sender ID and convert to long */
+long parse_sender(FILE *plr_file) {
+	return atol(findLine(plr_file, "Send:"));
+}
+
+/* Search file for recipient ID and convert to long */
+long parse_recipient(FILE *plr_file) {
+	return atoi(findLine(plr_file, "Reci:"));
+}
+
+/* Search file for date/time mail was sent and convert to long */
+long parse_send_time(FILE *plr_file) {
+	return atoi(findLine(plr_file, "Sent:"));
+}
+
+/* Search file for mail subject and return as string */
+char *parse_subject(FILE *plr_file) {
+	static char subj[1000];
+	char *txt = findLine(plr_file, "Subj:");
+	sprintf(subj, "%s", (txt == NULL) ? "(null)" : txt);
+	return (subj);
+}
+
+/* Search file for mail flags and return as bitvector */
+int parse_mail_flags(FILE *plr_file) {
+  int fl[4], ret=0;
+  char *txt, f1[33], f2[33], f3[33], f4[33];
+
+  if ((txt = findLine(plr_file, "Flag:")) != NULL) {
+    /* Read the flags */
+    if (sscanf(txt, "%s %s %s %s", f1, f2, f3, f4) == 4) {
+      fl[0] = asciiflag_conv(f1);
+      fl[1] = asciiflag_conv(f2);
+      fl[2] = asciiflag_conv(f3);
+      fl[3] = asciiflag_conv(f4);
+
+      /* convert from mail flags to mail index flags */
+      if (IS_SET_AR(fl, MAIL_DELETED))  SET_BIT(ret, MINDEX_DELETED);
+      if (IS_SET_AR(fl, MAIL_URGENT))   SET_BIT(ret, MINDEX_URGENT);
+      if (IS_SET_AR(fl, MAIL_COD))      SET_BIT(ret, MINDEX_IS_COD);
+      if (IS_SET_AR(fl, MAIL_FROM_MOB)) SET_BIT(ret, MINDEX_FROM_MOB);
+      if (IS_SET_AR(fl, MAIL_READ))     SET_BIT(ret, MINDEX_READ);
+      if (IS_SET_AR(fl, MAIL_DRAFT))    SET_BIT(ret, MINDEX_DRAFT);
+    }
+  }
+  if ((txt = findLine(plr_file, "Gold:")) != NULL) {
+    if (atol(txt) > 0) SET_BIT(ret, MINDEX_HAS_GOLD);
+  }
+  if ((txt = findLine(plr_file, "Objs:")) != NULL) {
+    SET_BIT(ret, MINDEX_HAS_OBJ);
+  }
+  return (ret);
+}
+
+int parseadminlevel(FILE *plr_file, int level) {
+	char *fromFile = findLine(plr_file, "Admn:");
+	if (fromFile != NULL)
+		return atoi(fromFile);
+
+	if (level >= 30)
+		return level-30;
+	else
+		return 0;
+}
+
+long parselast(FILE *plr_file) {
+	return atol(findLine(plr_file, "Last:"));
+}
+
+
+void walkdir(FILE *index_file, char *dir) {
+  char filename_qfd[1000], *subject, bits[65];
+  struct dirent *dp;
+  long id, sender, recipient, sent_time;
+  int flags;
+  DIR *dfd;
+  FILE *mail_file;
+
+  if ((dfd = opendir(dir)) == NULL)
+  {
+    fprintf(stderr, "Can't open %s\n", dir);
+    return;
+  }
+  while ((dp = readdir(dfd)) != NULL)
+  {
+    struct stat stbuf ;
+    sprintf( filename_qfd , "%s/%s",dir,dp->d_name) ;
+
+    if( stat(filename_qfd,&stbuf ) == -1 ) {
+      fprintf(stdout, "Unable to stat file: %s\n",filename_qfd) ;
+      continue ;
+    }
+
+    if ( ( stbuf.st_mode & S_IFMT ) == S_IFDIR ) {
+      if (!strcmp(".", dp->d_name) || !strcmp("..", dp->d_name))
+        continue;
+
+      walkdir(index_file, filename_qfd);
+  	} else {
+      char *name = parsefilename(dp->d_name);
+
+      if (name != NULL) {
+        /* Grab the data from the mail file and throw it in the index */
+        mail_file = fopen(filename_qfd, "r");
+
+        id        = parse_mailid(mail_file);
+        sender    = parse_sender(mail_file);
+        recipient = parse_recipient(mail_file);
+        sent_time = parse_send_time(mail_file);
+        flags     = parse_mail_flags(mail_file);
+        subject   = parse_subject(mail_file);
+
+        sprintascii(bits, flags);
+
+        fprintf(index_file, "%ld %s %ld %ld %ld %s\n", id, *bits ? bits : "0", sender, recipient, sent_time, subject);
+
+        fclose(mail_file);
+      }
+    }
+  }
+}
+
+int get_line(FILE *fl, char *buf)
+{
+  char temp[READ_SIZE];
+  int lines = 0;
+  int sl;
+
+  do {
+    if (!fgets(temp, READ_SIZE, fl))
+      return (0);
+    lines++;
+  } while (*temp == '*' || *temp == '\n' || *temp == '\r');
+
+  /* Last line of file doesn't always have a \n, but it should. */
+  sl = strlen(temp);
+  while (sl > 0 && (temp[sl - 1] == '\n' || temp[sl - 1] == '\r'))
+    temp[--sl] = '\0';
+
+  strcpy(buf, temp); /* strcpy: OK, if buf >= READ_SIZE (256) */
+  return (lines);
+}
+
+long asciiflag_conv(char *flag)
+{
+  long flags = 0;
+  int is_num = TRUE;
+  char *p;
+
+  for (p = flag; *p; p++) {
+    if (islower(*p))
+      flags |= 1 << (*p - 'a');
+    else if (isupper(*p))
+      flags |= 1 << (26 + (*p - 'A'));
+
+    /* Allow the first character to be a minus sign */
+    if (!isdigit(*p) && (*p != '-' || p != flag))
+      is_num = FALSE;
+  }
+
+  if (is_num)
+    flags = atol(flag);
+
+  return (flags);
+}
+
+int sprintascii(char *out, long bits)
+{
+  int i, j = 0;
+  /* 32 bits, don't just add letters to try to get more unless your bitvector_t is also as large. */
+  char *flags = "abcdefghijklmnopqrstuvwxyzABCDEF";
+
+  for (i = 0; flags[i] != '\0'; i++)
+    if (bits & (1 << i))
+      out[j++] = flags[i];
+
+  if (j == 0) /* Didn't write anything. */
+    out[j++] = '0';
+
+  /* NUL terminate the output string. */
+  out[j++] = '\0';
+  return j;
+}
diff --git a/src/utils.c b/src/utils.c
index 578e2cf..63d644e 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1516,3 +1516,24 @@ bool set_admin_level(struct char_data *ch, int admlvl)
 
   return TRUE;
 }
+
+/* add_commas takes a numeric value, and adds commas to it, returning a string */
+char *add_commas(long num)
+{
+  int i, j = 0, len;
+  int negative = (num < 0);
+  char num_string[MAX_INPUT_LENGTH];
+  static char commastring[MAX_INPUT_LENGTH];
+
+  sprintf(num_string, "%ld", num);
+  len = strlen(num_string);
+
+  for (i = 0; num_string[i]; i++) {
+    if ((len - i) % 3 == 0 && i && i - negative)
+      commastring[j++] = ',';
+    commastring[j++] = num_string[i];
+  }
+  commastring[j] = '\0';
+
+  return commastring;
+}
diff --git a/src/utils.h b/src/utils.h
index 915d5d8..2776e9a 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -69,6 +69,7 @@ char *strpaste(char *str1, char *str2, char *joiner);
 void new_affect(struct affected_type *af);
 int get_class_by_name(char *classname);
 bool set_admin_level(struct char_data *ch, int admlvl);
+char *add_commas(long num);
 
 /* Public functions made available form weather.c */
 void weather_and_time(int mode);
@@ -647,6 +648,8 @@ do                                                              \
 #define GET_DEFAULT_POS(ch)	((ch)->mob_specials.default_pos)
 /** Return the memory of ch. */
 #define MEMORY(ch)		((ch)->mob_specials.memory)
+/** Return the structure used for creating mudmail from mobs */
+#define MOB_MAIL(ch)	((ch)->mob_specials.ml_list)
 
 /** Return the equivalent strength of ch if ch has level 18 strength. */
 #define STRENGTH_APPLY_INDEX(ch) \
@@ -749,6 +752,8 @@ do                                                              \
 #define CAN_WEAR(obj, part)	OBJWEAR_FLAGGED((obj), (part))
 /** Return short description of obj. */
 #define GET_OBJ_SHORT(obj)      ((obj)->short_description)
+/** Return the mudmail that the object is attached to */
+#define IN_MAIL(obj)	((obj)->in_mail)
 
 /* Compound utilities and other macros. */
 /** Used to compute version. To see if the code running is newer than 3.0pl13,
@@ -1067,4 +1072,31 @@ do                                                              \
 /** What is the minimum level character to put on the wizlist? */
 #define CONFIG_MIN_WIZLIST_LEV  config_info.autowiz.min_wizlist_lev
 
+/* Mudmail Configuraton */
+/** Mail system enabled or not? */
+#define CONFIG_CAN_MAIL          config_info.mail.mail_allowed
+/** Able to attach objects to mails? */
+#define CONFIG_CAN_MAIL_OBJ      config_info.mail.objects_allowed
+/** Able to attach gold to mails? */
+#define CONFIG_CAN_MAIL_GOLD     config_info.mail.gold_allowed
+/** Cost of stamps per mail for mortals */
+#define CONFIG_STAMP_COST        config_info.mail.stamp_cost
+/** Extra Cost per object attachment for mortals */
+#define CONFIG_OBJECT_COST       config_info.mail.object_cost
+/** Minimum level that can send mails */
+#define CONFIG_MIN_MAIL_LEVEL    config_info.mail.min_level
+/** Lowest admin level that can always send free mails */
+#define CONFIG_FREE_MAIL_LEVEL   config_info.mail.min_free_level
+/** Can mails be saved as drafts for later sending? */
+#define CONFIG_DRAFTS_ALLOWED    config_info.mail.allow_drafts
+/** How long (in days) should draft mails be kept? */
+#define CONFIG_DRAFT_TIMEOUT     config_info.mail.draft_timeout
+/** While mailing, are players safe from attack or stealing? */
+#define CONFIG_SAFE_MAILING      config_info.mail.safe_mailing
+/** Minimum admin level at which a post office isn't required */
+#define CONFIG_MIN_MAIL_ANYWHERE config_info.mail.min_mail_anywhere
+/** Minimum admin level that can send to groups/all */
+#define CONFIG_MIN_SEND_TO_ALL   config_info.mail.min_send_to_all
+
+
 #endif /* _UTILS_H_ */