Index: calendar/gui/dialogs/task-page.c
===================================================================
--- calendar/gui/dialogs/task-page.c	(revision 33743)
+++ calendar/gui/dialogs/task-page.c	(working copy)
@@ -1863,16 +1863,18 @@
 
 		address_strings = g_list_append(address_strings, full);
 
-		/* Note that the address specified by the backend gets
-		 * precedence over the default mail address.
-		 */
-		if (backend_address && !strcmp (backend_address, a->id->address)) {
-			if (priv->default_address)
-				g_free (priv->default_address);
-			
-			priv->default_address = g_strdup (full);
-		} else if (a == def_account && !priv->default_address) {
-			priv->default_address = g_strdup (full);
+		if (a->enabled) {
+			/* Note that the address specified by the backend gets
+			 * precedence over the default mail address.
+			 */
+			if (backend_address && !strcmp (backend_address, a->id->address)) {
+				if (priv->default_address)
+					g_free (priv->default_address);
+
+				priv->default_address = g_strdup (full);
+			} else if (a == def_account && !priv->default_address) {
+				priv->default_address = g_strdup (full);
+			}
 		}
 	}
 	
Index: calendar/gui/dialogs/event-page.c
===================================================================
--- calendar/gui/dialogs/event-page.c	(revision 33743)
+++ calendar/gui/dialogs/event-page.c	(working copy)
@@ -3069,16 +3069,18 @@
 
 		address_strings = g_list_append(address_strings, full);
 
-		/* Note that the address specified by the backend gets
-		 * precedence over the default mail address.
-		 */
-		if (backend_address && !strcmp (backend_address, a->id->address)) {
-			if (priv->default_address)
-				g_free (priv->default_address);
-			
-			priv->default_address = g_strdup (full);
-		} else if (a == def_account && !priv->default_address) {
-			priv->default_address = g_strdup (full);
+		if (a->enabled) {
+			/* Note that the address specified by the backend gets
+			 * precedence over the default mail address.
+			 */
+			if (backend_address && !strcmp (backend_address, a->id->address)) {
+				if (priv->default_address)
+					g_free (priv->default_address);
+
+				priv->default_address = g_strdup (full);
+			} else if (a == def_account && !priv->default_address && a->enabled) {
+				priv->default_address = g_strdup (full);
+			}
 		}
 	}
 	
Index: calendar/ChangeLog
===================================================================
--- calendar/ChangeLog	(revision 33743)
+++ calendar/ChangeLog	(working copy)
@@ -1,3 +1,11 @@
+2007-07-03  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #270605
+
+	* gui/dialogs/event-page.c: (event_page_construct):
+	* gui/dialogs/task-page.c: (task_page_construct):
+	Don't preselect disabled account as organizer.
+
 2007-06-18  Srinivasa Ragavan  <sragavan@novell.com>
 
         ** Fix for bug #448223 from Gilles Dartiguelongue
