Set the can_sync_offline property on the EFolder based on the

* e-corba-storage.c (impl_StorageListener_notifyFolderCreated):
Set the can_sync_offline property on the EFolder based on the
canSyncOffline value on the CORBA folder.

* evolution-test-component.c (setup_custom_storage): Pass FALSE
for @sync_offline to evolution_storage_new_folder().

* e-local-storage.c (new_folder): Pass FALSE for @sync_offline to
evolution_storage_new_folder().

* evolution-storage.h (evolution_storage_new_folder): New arg
@can_sync_offline.

* subscribe-dialog.c (recursive_add_folder): Pass TRUE for
@sync_offline to evolution_storage_new_folder().

* mail-folder-cache.c (real_flush_updates): Pass TRUE for
@sync_offline to evolution_storage_new_folder().

* gui/component/addressbook-storage.c (load_source_data): Pass
FALSE for @sync_offline to evolution_storage_new_folder().
(addressbook_storage_add_source): Pass FALSE for @sync_offline to
evolution_storage_new_folder().

svn path=/trunk/; revision=16947

4 files changed, 126 insertions, 410 deletions

diff --git a/mail/ChangeLog b/mail/ChangeLog
index b78dbef629..838d31935f 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,5 +1,13 @@
 2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
 
+	* subscribe-dialog.c (recursive_add_folder): Pass TRUE for
+	@sync_offline to evolution_storage_new_folder().
+
+	* mail-folder-cache.c (real_flush_updates): Pass TRUE for 
+	@sync_offline to evolution_storage_new_folder().
+
+2002-05-20  Ettore Perazzoli  <ettore@ximian.com>
+
 	* mail-callbacks.c (composer_sent_cb): Always unref the composer
 	[even when we are destroying it], otherwise we leak it and we get
 	the nasty bug where you can't quit.
diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 3c6884c5cf..0040fe6271 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -250,7 +250,7 @@ Click &quot;Finish&quot; to save your settings.</text>
 	  <name>account_vbox</name>
 	  <border_width>3</border_width>
 	  <homogeneous>False</homogeneous>
-	  <spacing>0</spacing>
+	  <spacing>3</spacing>
 
 	  <widget>
 	    <class>GtkLabel</class>
@@ -261,8 +261,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
 	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
+	    <xpad>3</xpad>
+	    <ypad>3</ypad>
 	    <child>
 	      <padding>0</padding>
 	      <expand>False</expand>
@@ -476,8 +476,8 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	  <class>GtkTable</class>
 	  <name>identity_optional_table</name>
 	  <border_width>3</border_width>
-	  <rows>4</rows>
-	  <columns>4</columns>
+	  <rows>3</rows>
+	  <columns>2</columns>
 	  <homogeneous>False</homogeneous>
 	  <row_spacing>3</row_spacing>
 	  <column_spacing>3</column_spacing>
@@ -512,14 +512,13 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	  <widget>
 	    <class>GtkLabel</class>
 	    <name>label-sig-text</name>
-	    <label>_Text Signature:</label>
+	    <label>_Default signature:</label>
 	    <justify>GTK_JUSTIFY_LEFT</justify>
 	    <wrap>False</wrap>
 	    <xalign>0</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
-	    <default_focus_target>option-sig-text</default_focus_target>
 	    <child>
 	      <left_attach>0</left_attach>
 	      <right_attach>1</right_attach>
@@ -537,33 +536,6 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>label-sig-html</name>
-	    <label>_HTML Signature:</label>
-	    <justify>GTK_JUSTIFY_LEFT</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>option-sig-html</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkEntry</class>
 	    <name>identity_organization</name>
 	    <can_focus>True</can_focus>
@@ -573,7 +545,7 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	    <text></text>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
+	      <right_attach>2</right_attach>
 	      <top_attach>1</top_attach>
 	      <bottom_attach>2</bottom_attach>
 	      <xpad>0</xpad>
@@ -588,143 +560,6 @@ For example: &quot;Work&quot; or &quot;Personal&quot;</label>
 	  </widget>
 
 	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-sig-edit-text</name>
-	    <can_focus>True</can_focus>
-	    <label> Edit </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-sig-edit-html</name>
-	    <can_focus>True</can_focus>
-	    <label> Edit </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>3</left_attach>
-	      <right_attach>4</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-sig-new-text</name>
-	    <can_focus>True</can_focus>
-	    <label> New </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>2</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkButton</class>
-	    <name>button-sig-new-html</name>
-	    <can_focus>True</can_focus>
-	    <label> New </label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <child>
-	      <left_attach>2</left_attach>
-	      <right_attach>3</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>option-sig-html</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Same as text
-Random
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>3</top_attach>
-	      <bottom_attach>4</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkOptionMenu</class>
-	    <name>option-sig-text</name>
-	    <can_focus>True</can_focus>
-	    <items>None
-Random
-</items>
-	    <initial_choice>0</initial_choice>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkLabel</class>
 	    <name>reply_to_label</name>
 	    <label>Re_ply-To:</label>
@@ -761,7 +596,7 @@ Random
 	    <text></text>
 	    <child>
 	      <left_attach>1</left_attach>
-	      <right_attach>4</right_attach>
+	      <right_attach>2</right_attach>
 	      <top_attach>0</top_attach>
 	      <bottom_attach>1</bottom_attach>
 	      <xpad>0</xpad>
@@ -774,6 +609,41 @@ Random
 	      <yfill>False</yfill>
 	    </child>
 	  </widget>
+
+	  <widget>
+	    <class>GtkAlignment</class>
+	    <name>alignment27</name>
+	    <xalign>0</xalign>
+	    <yalign>0.5</yalign>
+	    <xscale>0</xscale>
+	    <yscale>1</yscale>
+	    <child>
+	      <left_attach>1</left_attach>
+	      <right_attach>2</right_attach>
+	      <top_attach>2</top_attach>
+	      <bottom_attach>3</bottom_attach>
+	      <xpad>0</xpad>
+	      <ypad>0</ypad>
+	      <xexpand>True</xexpand>
+	      <yexpand>False</yexpand>
+	      <xshrink>False</xshrink>
+	      <yshrink>False</yshrink>
+	      <xfill>True</xfill>
+	      <yfill>False</yfill>
+	    </child>
+
+	    <widget>
+	      <class>GtkOptionMenu</class>
+	      <name>optionmenu2</name>
+	      <can_focus>True</can_focus>
+	      <items>Default
+
+Signature #1
+Signature #2
+</items>
+	      <initial_choice>0</initial_choice>
+	    </widget>
+	  </widget>
 	</widget>
       </widget>
     </widget>
@@ -4374,8 +4244,8 @@ Baltic (ISO-8859-4)
 	    <class>GtkCList</class>
 	    <name>clistSignatures</name>
 	    <can_focus>True</can_focus>
-	    <columns>2</columns>
-	    <column_widths>189,80</column_widths>
+	    <columns>1</columns>
+	    <column_widths>80</column_widths>
 	    <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
 	    <show_titles>True</show_titles>
 	    <shadow_type>GTK_SHADOW_IN</shadow_type>
@@ -4383,22 +4253,9 @@ Baltic (ISO-8859-4)
 	    <widget>
 	      <class>GtkLabel</class>
 	      <child_name>CList:title</child_name>
-	      <name>lblSignature</name>
-	      <label>Signature</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
-	      <wrap>False</wrap>
-	      <xalign>0.5</xalign>
-	      <yalign>0.5</yalign>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	    </widget>
-
-	    <widget>
-	      <class>GtkLabel</class>
-	      <child_name>CList:title</child_name>
-	      <name>lblRandomized</name>
-	      <label>Randomized</label>
-	      <justify>GTK_JUSTIFY_CENTER</justify>
+	      <name>label448</name>
+	      <label>Description</label>
+	      <justify>GTK_JUSTIFY_LEFT</justify>
 	      <wrap>False</wrap>
 	      <xalign>0.5</xalign>
 	      <yalign>0.5</yalign>
@@ -4421,23 +4278,6 @@ Baltic (ISO-8859-4)
 	  </child>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSpacer</name>
-	    <label></label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkVButtonBox</class>
 	    <name>vbuttonbox25</name>
 	    <layout_style>GTK_BUTTONBOX_START</layout_style>
@@ -4457,7 +4297,7 @@ Baltic (ISO-8859-4)
 	      <name>cmdSignatureAdd</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>_Add</label>
+	      <label>_Create Signature</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
 
@@ -4475,29 +4315,80 @@ Baltic (ISO-8859-4)
 	      <name>cmdSignatureDelete</name>
 	      <can_default>True</can_default>
 	      <can_focus>True</can_focus>
-	      <label>_Delete</label>
+	      <label>_Duplicate</label>
 	      <relief>GTK_RELIEF_NORMAL</relief>
 	    </widget>
-	  </widget>
 
-	  <widget>
-	    <class>GtkToggleButton</class>
-	    <name>chkRandomSignature</name>
-	    <can_focus>True</can_focus>
-	    <label>_Random</label>
-	    <relief>GTK_RELIEF_NORMAL</relief>
-	    <active>False</active>
-	    <child>
-	      <padding>0</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
+	    <widget>
+	      <class>GtkButton</class>
+	      <name>button1</name>
+	      <can_default>True</can_default>
+	      <can_focus>True</can_focus>
+	      <label>_Remove</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
+	    </widget>
+
+	    <widget>
+	      <class>GtkButton</class>
+	      <name>button2</name>
+	      <can_default>True</can_default>
+	      <can_focus>True</can_focus>
+	      <label>_Add Script...</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
+	    </widget>
 	  </widget>
 	</widget>
       </widget>
 
       <widget>
 	<class>GtkHBox</class>
+	<name>hbox165</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>False</fill>
+	</child>
+
+	<widget>
+	  <class>GtkLabel</class>
+	  <name>label449</name>
+	  <label>De_fault signature:</label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
+	  <wrap>False</wrap>
+	  <xalign>0.5</xalign>
+	  <yalign>0.5</yalign>
+	  <xpad>3</xpad>
+	  <ypad>0</ypad>
+	  <default_focus_target>optionmenu1</default_focus_target>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+
+	<widget>
+	  <class>GtkOptionMenu</class>
+	  <name>optionmenu1</name>
+	  <can_focus>True</can_focus>
+	  <items>Random
+
+Signature #1
+Signature #2
+</items>
+	  <initial_choice>0</initial_choice>
+	  <child>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	  </child>
+	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkHBox</class>
 	<name>hbox162</name>
 	<border_width>3</border_width>
 	<homogeneous>False</homogeneous>
@@ -4533,191 +4424,6 @@ Baltic (ISO-8859-4)
 	  </widget>
 	</widget>
       </widget>
-
-      <widget>
-	<class>GtkCheckButton</class>
-	<name>chkAdvancedSignature</name>
-	<can_focus>True</can_focus>
-	<label>E_nable advanced options</label>
-	<active>False</active>
-	<draw_indicator>True</draw_indicator>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-      </widget>
-
-      <widget>
-	<class>GtkFrame</class>
-	<name>frameAdvancedOptions</name>
-	<label>Advanced Options</label>
-	<label_xalign>0</label_xalign>
-	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
-	<child>
-	  <padding>0</padding>
-	  <expand>False</expand>
-	  <fill>False</fill>
-	</child>
-
-	<widget>
-	  <class>GtkTable</class>
-	  <name>tableAdvancedOptions</name>
-	  <border_width>3</border_width>
-	  <rows>3</rows>
-	  <columns>2</columns>
-	  <homogeneous>False</homogeneous>
-	  <row_spacing>3</row_spacing>
-	  <column_spacing>3</column_spacing>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSignatureFilename</name>
-	    <label>_Filename:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>entry-sig-filename</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>fileSignatureFilename</name>
-	    <history_id>sig-filename</history_id>
-	    <max_saved>10</max_saved>
-	    <title>Select a signature file</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>1</top_attach>
-	      <bottom_attach>2</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>entry-sig-filename</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GnomeFileEntry</class>
-	    <name>fileSignatureScript</name>
-	    <history_id>sig-script</history_id>
-	    <max_saved>10</max_saved>
-	    <title>Select a signature script</title>
-	    <directory>False</directory>
-	    <modal>True</modal>
-	    <child>
-	      <left_attach>1</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>True</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-
-	    <widget>
-	      <class>GtkEntry</class>
-	      <child_name>GnomeEntry:entry</child_name>
-	      <name>entry-sig-script</name>
-	      <can_focus>True</can_focus>
-	      <editable>True</editable>
-	      <text_visible>True</text_visible>
-	      <text_max_length>0</text_max_length>
-	      <text></text>
-	    </widget>
-	  </widget>
-
-	  <widget>
-	    <class>GtkLabel</class>
-	    <name>lblSignatureScript</name>
-	    <label>_Script:</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <default_focus_target>entry-sig-script</default_focus_target>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>1</right_attach>
-	      <top_attach>2</top_attach>
-	      <bottom_attach>3</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-
-	  <widget>
-	    <class>GtkCheckButton</class>
-	    <name>chkHtmlSignature</name>
-	    <can_focus>True</can_focus>
-	    <label>Use _HTML for this signature</label>
-	    <active>False</active>
-	    <draw_indicator>True</draw_indicator>
-	    <child>
-	      <left_attach>0</left_attach>
-	      <right_attach>2</right_attach>
-	      <top_attach>0</top_attach>
-	      <bottom_attach>1</bottom_attach>
-	      <xpad>0</xpad>
-	      <ypad>0</ypad>
-	      <xexpand>False</xexpand>
-	      <yexpand>False</yexpand>
-	      <xshrink>False</xshrink>
-	      <yshrink>False</yshrink>
-	      <xfill>True</xfill>
-	      <yfill>False</yfill>
-	    </child>
-	  </widget>
-	</widget>
-      </widget>
     </widget>
 
     <widget>
diff --git a/mail/mail-folder-cache.c b/mail/mail-folder-cache.c
index a9479f3d36..4ceb61b16a 100644
--- a/mail/mail-folder-cache.c
+++ b/mail/mail-folder-cache.c
@@ -190,7 +190,9 @@ real_flush_updates(void *o, void *event_data, void *data)
 				char *type = (strncmp(up->uri, "vtrash:", 7)==0)?"vtrash":"mail";
 			
 				d(printf("Adding new folder: %s\n", up->path));
-				evolution_storage_new_folder(storage, up->path, up->name, type, up->uri, up->name, up->unread);
+				evolution_storage_new_folder(storage,
+							     up->path, up->name, type, up->uri, up->name, up->unread,
+							     TRUE);
 			}
 
 			if (!up->olduri && up->add)
diff --git a/mail/subscribe-dialog.c b/mail/subscribe-dialog.c
index 25d6290094..b7a65e3089 100644
--- a/mail/subscribe-dialog.c
+++ b/mail/subscribe-dialog.c
@@ -185,7 +185,7 @@ recursive_add_folder (EvolutionStorage *storage, const char *path, const char *n
 		g_free (parent);
 	}
 
-	evolution_storage_new_folder (storage, path, name, "mail", url, name, FALSE);
+	evolution_storage_new_folder (storage, path, name, "mail", url, name, FALSE, TRUE);
 }
 
 /* ** Get one level of folderinfo ****************************************** */