diff --git a/mbuni/ChangeLog b/mbuni/ChangeLog
index 38c2e1b..7031975 100644
--- a/mbuni/ChangeLog
+++ b/mbuni/ChangeLog
@@ -9,5 +9,4 @@ Mbuni 0.9.7 - 2005-02-20
    * Added access.log
    * various minor bug fixes
 Mbuni 0.9.8 - 
-   * Adding mmbox support
-   * more generalised, message store
+   * Added mmbox support
diff --git a/mbuni/config.h.in b/mbuni/config.h.in
new file mode 100644
index 0000000..1e1150b
--- /dev/null
+++ b/mbuni/config.h.in
@@ -0,0 +1,146 @@
+/* config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define to 1 if the `closedir' function returns void instead of `int'. */
+#undef CLOSEDIR_VOID
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_DIRENT_H
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the <float.h> header file. */
+#undef HAVE_FLOAT_H
+
+/* Define to 1 if you have the `floor' function. */
+#undef HAVE_FLOOR
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `gwlib' library (-lgwlib). */
+#undef HAVE_LIBGWLIB
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the `wap' library (-lwap). */
+#undef HAVE_LIBWAP
+
+/* Define to 1 if you have the `xml2' library (-lxml2). */
+#undef HAVE_LIBXML2
+
+/* Define to 1 if you have the `localtime_r' function. */
+#undef HAVE_LOCALTIME_R
+
+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
+   to 0 otherwise. */
+#undef HAVE_MALLOC
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the `memset' function. */
+#undef HAVE_MEMSET
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+#undef HAVE_NDIR_H
+
+/* Define to 1 if you have the `sqrt' function. */
+#undef HAVE_SQRT
+
+/* Define to 1 if `stat' has the bug that it succeeds when given the
+   zero-length file name argument. */
+#undef HAVE_STAT_EMPTY_STRING_BUG
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strerror' function. */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strtol' function. */
+#undef HAVE_STRTOL
+
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_DIR_H
+
+/* Define to 1 if you have the <sys/file.h> header file. */
+#undef HAVE_SYS_FILE_H
+
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+#undef HAVE_SYS_NDIR_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+#undef HAVE_SYS_WAIT_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
+   slash. */
+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#undef RETSIGTYPE
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
+#undef TM_IN_SYS_TIME
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
+
+/* Define to rpl_malloc if the replacement function should be used. */
+#undef malloc
+
+/* Define to empty if the keyword `volatile' does not work. Warning: valid
+   code using `volatile' can become incorrect without. Disable with care. */
+#undef volatile
diff --git a/mbuni/mmlib/mms_msg.c b/mbuni/mmlib/mms_msg.c
index b6b563b..0c5a600 100644
--- a/mbuni/mmlib/mms_msg.c
+++ b/mbuni/mmlib/mms_msg.c
@@ -1054,9 +1054,11 @@ MmsMsg *mms_frombinary(Octstr *msg, Octstr *from)
      if ((res = decode_msgbody(p, &_m)) < 0) {
 	  MmsMsg *msg = &_m;
 	  if (msg->ismultipart && msg->body.l)
-	       list_contents_destroy(msg->body.l, (list_item_destructor_t *)mm_destroy);     
+	       list_destroy(msg->body.l, (list_item_destructor_t *)mm_destroy);     
 	  else if (msg->body.s)
 	       octstr_destroy(msg->body.s);
+	  msg->ismultipart = 0;
+	  msg->body.s = NULL;
      }
 	 
      m = gw_malloc(sizeof (*m));
diff --git a/mbuni/mmlib/mms_util.c b/mbuni/mmlib/mms_util.c
index 4b9396d..e878384 100644
--- a/mbuni/mmlib/mms_util.c
+++ b/mbuni/mmlib/mms_util.c
@@ -722,18 +722,6 @@ int mms_ind_send(Octstr *prov_cmd, Octstr *to)
      return res;
 }
 
-void list_contents_destroy(List *list, list_item_destructor_t *destructor)
-{
-     if (!list)
-	  return;
-     
-     int ll = list_len(list), lc;
-
-     for(lc=0;lc<ll;lc++) 
-	  destructor(list_get(list, lc));
-     list_delete(list, 0, ll);
-}
-
 static void addmmscname(Octstr *s, Octstr *myhostname)
 {
      int j;
diff --git a/mbuni/mmlib/mms_util.h b/mbuni/mmlib/mms_util.h
index 06ee7ef..fb692a9 100644
--- a/mbuni/mmlib/mms_util.h
+++ b/mbuni/mmlib/mms_util.h
@@ -156,9 +156,6 @@ void base64_mimeparts(MIMEEntity *m);
 void notify_prov_server(char *cmd, char *from, char *event, char *arg);
 int mms_ind_send(Octstr *prov_cmd, Octstr *to);
 
-/* Deletes all the elements of a list, but leaves the list itself alone. */
-void list_contents_destroy(List *list, list_item_destructor_t *destructor);
-
 /* Send this message to email recipient: Returns 0 on success 1 or 2 on profile error 
  * (negate to get right one), -ve on some other error
  */