Index: mail/mail-mt.c
===================================================================
--- mail/mail-mt.c	(revision 33290)
+++ mail/mail-mt.c	(working copy)
@@ -256,10 +256,6 @@ void mail_msg_check_error(void *msg)
 	checkmem(m->priv);
 #endif
 	
-	/* don't report any errors if we are not in interactive mode */
-	if (!mail_session_get_interactive ())
-		return;
-	
 	if (!camel_exception_is_set(&m->ex)
 	    || m->ex.id == CAMEL_EXCEPTION_USER_CANCEL
 	    || m->ex.id == CAMEL_EXCEPTION_FOLDER_INVALID_UID)
Index: mail/mail-session.c
===================================================================
--- mail/mail-session.c	(revision 33290)
+++ mail/mail-session.c	(working copy)
@@ -66,7 +66,6 @@ static int session_check_junk_notify_id 
 typedef struct _MailSession {
 	CamelSession parent_object;
 
-	gboolean interactive;
 	FILE *filter_logfile;
 
 	MailAsyncEvent *async;
@@ -368,9 +367,6 @@ alert_user(CamelSession *session, CamelS
 	EMsgPort *user_message_reply = NULL;
 	gboolean ret;
 
-	if (!mail_session->interactive)
-		return FALSE;
-
 	if (cancel)
 		user_message_reply = e_msgport_new ();	
 	m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m));
@@ -665,38 +661,6 @@ mail_session_init (const char *base_dire
 	g_free (camel_dir);
 }
 
-gboolean
-mail_session_get_interactive (void)
-{
-	return MAIL_SESSION (session)->interactive;
-}
-
-void
-mail_session_set_interactive (gboolean interactive)
-{
-	MAIL_SESSION (session)->interactive = interactive;
-	
-	if (!interactive) {
-		struct _user_message_msg *um;
-		
-		d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n"));
-
-		e_passwords_cancel();
-		
-		/* flush/cancel pending user messages */
-		while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) {
-			d(printf ("Flusing message request: %s\n", um->prompt));
-			e_msgport_reply((EMsg *) um);
-		}
-		
-		/* and the current */
-		if (message_dialog) {
-			d(printf("Destroying message dialogue\n"));
-			gtk_widget_destroy ((GtkWidget *) message_dialog);
-		}
-	}
-}
-
 void
 mail_session_forget_passwords (BonoboUIComponent *uih, void *user_data,
 			       const char *path)
Index: mail/mail-session.h
===================================================================
--- mail/mail-session.h	(revision 33290)
+++ mail/mail-session.h	(working copy)
@@ -33,8 +33,6 @@ extern "C" {
 #endif /* __cplusplus */
 
 void mail_session_init (const char *base_directory);
-gboolean mail_session_get_interactive (void);
-void mail_session_set_interactive (gboolean interactive);
 char *mail_session_request_dialog (const char *prompt, gboolean secret,
 				   const char *key, gboolean async);
 gboolean mail_session_accept_dialog (const char *prompt, const char *key,
Index: mail/mail-component.c
===================================================================
--- mail/mail-component.c	(revision 33290)
+++ mail/mail-component.c	(working copy)
@@ -691,7 +691,6 @@ impl_createView (PortableServer_Servant 
 	GtkWidget *statusbar_widget;
 	char *uri;
 	
-	mail_session_set_interactive(TRUE);
 	mc_startup(mail_component);
 
 	view_widget = em_folder_browser_new ();
