Index: libtinymail-gnome-desktop/tny-device.c
===================================================================
--- libtinymail-gnome-desktop/tny-device.c	(revision 502)
+++ libtinymail-gnome-desktop/tny-device.c	(working copy)
@@ -22,78 +22,25 @@
 #include <glib/gi18n-lib.h>
 
 #include <tny-device.h>
-#include <libnm_glib.h>
 
 static GObjectClass *parent_class = NULL;
 
 #include "tny-device-priv.h"
 
-static void
-tny_device_on_online (TnyDeviceIface *self)
-{
-	g_signal_emit (self, tny_device_iface_signals [TNY_DEVICE_IFACE_CONNECTION_CHANGED], 0, TRUE);
-
-	return;
-}
-
-static void
-tny_device_on_offline (TnyDeviceIface *self)
-{
-	g_signal_emit (self, tny_device_iface_signals [TNY_DEVICE_IFACE_CONNECTION_CHANGED], 0, FALSE);
-
-	return;
-}
-
-static gboolean
+	static gboolean
 tny_device_is_online (TnyDeviceIface *self)
 {
 	TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self);
-
-	libnm_glib_state state = libnm_glib_get_network_state (priv->nm_ctx);
-	gboolean retval;
-
-	switch (state)
-	{
-		case LIBNM_NO_NETWORK_CONNECTION:
-		retval = FALSE;
-		break;
-
-		case LIBNM_NO_DBUS:
-		case LIBNM_NO_NETWORKMANAGER:
-		case LIBNM_INVALID_CONTEXT:
-		g_print (_("Invalid network manager installation. Going to assume Online status\n"));
-		case LIBNM_ACTIVE_NETWORK_CONNECTION:
-		default:
-		retval = TRUE;
-		break;
-	}
-
+	gboolean retval = TRUE;
 	return retval;
 }
 
-static void 
-nm_callback (libnm_glib_ctx *nm_ctx, gpointer user_data)
-{
-	TnyDeviceIface *self = (TnyDeviceIface *)user_data;
-
-	if (tny_device_is_online (self))
-		tny_device_on_online (self);
-	else
-		tny_device_on_offline (self);
-
-	return;
-}
-
 static void
 tny_device_instance_init (GTypeInstance *instance, gpointer g_class)
 {
 	TnyDevice *self = (TnyDevice *)instance;
 	TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self);
 
-	priv->nm_ctx = libnm_glib_init ();
-	priv->callback_id = libnm_glib_register_callback 
-		(priv->nm_ctx, nm_callback, self, NULL);
-
 	return;
 }
 
@@ -119,10 +66,6 @@
 	TnyDevice *self = (TnyDevice *)object;	
 	TnyDevicePriv *priv = TNY_DEVICE_GET_PRIVATE (self);
 
-
-	libnm_glib_unregister_callback (priv->nm_ctx, priv->callback_id);
-	libnm_glib_shutdown (priv->nm_ctx);
-
 	(*parent_class->finalize) (object);
 
 	return;
Index: libtinymail-gnome-desktop/tny-device-priv.h
===================================================================
--- libtinymail-gnome-desktop/tny-device-priv.h	(revision 502)
+++ libtinymail-gnome-desktop/tny-device-priv.h	(working copy)
@@ -24,8 +24,6 @@
 
 struct _TnyDevicePriv
 {
-	libnm_glib_ctx *nm_ctx;
-	guint callback_id;
 };
 
 
Index: libtinymail-camel/tny-store-account.c
===================================================================
--- libtinymail-camel/tny-store-account.c	(revision 502)
+++ libtinymail-camel/tny-store-account.c	(working copy)
@@ -210,9 +210,9 @@
 			case CAMEL_FOLDER_TYPE_JUNK:
 				_tny_msg_folder_set_folder_type (folder, TNY_MSG_FOLDER_TYPE_JUNK); 
 			break;
-			case CAMEL_FOLDER_TYPE_SENT:
-				_tny_msg_folder_set_folder_type (folder, TNY_MSG_FOLDER_TYPE_SENT); 
-			break;
+//			case CAMEL_FOLDER_TYPE_SENT:
+//				_tny_msg_folder_set_folder_type (folder, TNY_MSG_FOLDER_TYPE_SENT); 
+//			break;
 			default:
 				_tny_msg_folder_set_folder_type (folder, TNY_MSG_FOLDER_TYPE_NORMAL);
 			break;
Index: libtinymailui-gtk/tny-save-strategy.c
===================================================================
--- libtinymailui-gtk/tny-save-strategy.c	(revision 502)
+++ libtinymailui-gtk/tny-save-strategy.c	(working copy)
@@ -105,8 +105,8 @@
 		GTK_RESPONSE_ACCEPT, NULL));
 	gboolean destr=FALSE;
 
-	gtk_file_chooser_set_do_overwrite_confirmation 
-		(GTK_FILE_CHOOSER (dialog), TRUE);
+//	gtk_file_chooser_set_do_overwrite_confirmation 
+//		(GTK_FILE_CHOOSER (dialog), TRUE);
 
 	gtk_file_chooser_set_current_folder 
 		(GTK_FILE_CHOOSER (dialog), g_get_home_dir ());
Index: configure.ac
===================================================================
--- configure.ac	(revision 502)
+++ configure.ac	(working copy)
@@ -164,7 +164,7 @@
 
 dnl ### libtinymail-gnome-desktop, a GNOME platform library implementation ##
 if test x$PLATFORMDIR = xlibtinymail-gnome-desktop; then
-  PKG_CHECK_MODULES(LIBTINYMAIL_GNOME_DESKTOP, $extraplatpkgs libnm_glib glib-2.0 >= 2.8 gobject-2.0 libgnomeui-2.0 gtk+-2.0)
+  PKG_CHECK_MODULES(LIBTINYMAIL_GNOME_DESKTOP, $extraplatpkgs glib-2.0 >= 2.8 gobject-2.0 gconf-2.0 gtk+-2.0)
 else
   LIBTINYMAIL_GNOME_DESKTOP_CFLAGS=
   LIBTINYMAIL_GNOME_DESKTOP_LIBS=
@@ -194,7 +194,7 @@
 dnl ### tinymail-python, the python language bindings ##
 if test x$build_pytinymail = xtrue; then
   AM_PATH_PYTHON(2.3)
-  AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
+  dnl AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
   AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
   if test "x$PYGTK_CODEGEN" = xno; then
 	AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)