diff --git a/mail/ChangeLog b/mail/ChangeLog
index f828078786..7f5ac335ee 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-03  Peter Williams  <peterw@ximian.com>
+
+	* folder-browser.c (message_list_drag_data_get): Compile fixes.
+	#include errno.h and gnome-dialog-utils.h. s/dirname/tmpdir/
+
 2001-07-03  Peter Williams  <peterw@ximian.com>
 
 	Prevent folders from appearing to have -1 new messages. Prevent
diff --git a/mail/folder-browser.c b/mail/folder-browser.c
index c52c9916f1..497a65ddc5 100644
--- a/mail/folder-browser.c
+++ b/mail/folder-browser.c
@@ -13,6 +13,7 @@
 #endif
 
 #include <ctype.h>
+#include <errno.h>
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtkinvisible.h>
@@ -23,6 +24,8 @@
 #include <gal/widgets/e-popup-menu.h>
 #include <gal/widgets/e-unicode.h>
 
+#include <libgnomeui/gnome-dialog-util.h>
+
 #include <gtkhtml/htmlengine.h>
 
 #include "filter/vfolder-rule.h"
@@ -188,12 +191,10 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col,
 	switch (info) {
 	case DND_TARGET_TYPE_TEXT_URI_LIST:
 	{
-		char *uri_list, tmpdir, *tmpl;
+		char *uri_list, *tmpdir, *tmpl;
 		CamelMimeMessage *message;
 		const char *filename;
 		CamelStream *stream;
-		char *uri_list;
-		char *tmpdir;
 		int fd;
 		
 		tmpl = g_strdup ("/tmp/evolution.XXXXXX");
@@ -229,7 +230,7 @@ message_list_drag_data_get (ETree *tree, int row, ETreePath path, int col,
 		} else
 			filename = "mbox";
 		
-		uri_list = g_strdup_printf ("file://%s/%s", dirname, filename);
+		uri_list = g_strdup_printf ("file://%s/%s", tmpdir, filename);
 		
 		fd = open (uri_list + 7, O_WRONLY | O_CREAT, 0600);
 		if (fd == -1) {