--- evolution-data-server-2.25.4/camel/camel-mime-utils.c	2008-11-27 10:41:04.000000000 +0100
+++ 347520.c	2009-02-03 00:26:03.000000000 +0100
@@ -46,11 +46,11 @@
 
 #include <libedataserver/e-time-utils.h>
 
-#include "camel-charset-map.h"
-#include "camel-iconv.h"
-#include "camel-mime-utils.h"
-#include "camel-net-utils.h"
-#include "camel-utf8.h"
+#include <camel/camel-charset-map.h>
+#include <camel/camel-iconv.h>
+#include <camel/camel-mime-utils.h>
+#include <camel/camel-net-utils.h>
+#include <camel/camel-utf8.h>
 
 #ifdef G_OS_WIN32
 /* Undef the similar macro from pthread.h, it doesn't check if
@@ -73,7 +73,7 @@
 #endif
 
 /* for all non-essential warnings ... */
-#define w(x)
+#define w(x) (x)
 
 #define d(x)
 #define d2(x)
@@ -5006,3 +5006,22 @@
 
 	return out;
 }
+
+int
+main (int argc, char *argv[])
+{
+	struct _camel_header_address *ret;
+
+	if (argc != 2)
+		return 1;
+
+	ret = camel_header_address_decode(argv[1], "UTF-8");
+
+	if (!ret)
+		return 1;
+
+	printf("name: %s\n", ret->name);
+	printf("addr: %s\n", ret->v.addr);
+
+	return 0;
+}
