3 files changed, 29 insertions, 13 deletions
diff --git a/shell/apps_evolution_shell.schemas.in b/shell/apps_evolution_shell.schemas.in
index 1c79c6f132..c908de65e5 100644
--- a/shell/apps_evolution_shell.schemas.in
+++ b/shell/apps_evolution_shell.schemas.in
@@ -41,7 +41,35 @@
       </locale>
     </schema>
 
- <!-- Offline Mode -->
+    <!-- Initial attachment view (icon or list) -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/attachment_view</key>
+      <applyto>/apps/evolution/shell/attachment_view</applyto>
+      <owner>evolution</owner>
+      <type>int</type>
+      <default>0</default>
+      <locale name="C">
+        <short>Initial attachment view</short>
+        <long>Initial view for attachment bar widgets.
+        "0" is Icon View, "1" is List View.</long>
+      </locale>
+    </schema>
+
+    <!-- Initial GtkFileChooser Folder -->
+
+    <schema>
+      <key>/schemas/apps/evolution/shell/current_folder</key>
+      <applyto>/apps/evolution/shell/current-folder</applyto>
+      <owner>evolution</owner>
+      <type>string</type>
+      <locale name="C">
+        <short>Initial file chooser folder</short>
+        <long>Initial folder for GtkFileChooser dialogs.</long>
+      </locale>
+    </schema>
+
+    <!-- Offline Mode -->
 
     <schema>
       <key>/schemas/apps/evolution/shell/start_offline</key>
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 49292c0c35..2c5f00460a 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -804,16 +804,6 @@ shell_class_init (EShellClass *class)
 	/* Install some application-wide settings. */
 
 	e_shell_settings_install_property (
-		g_param_spec_int (
-			"attachment-view",
-			NULL,
-			NULL,
-			0,
-			1,
-			0,
-			G_PARAM_READWRITE));
-
-	e_shell_settings_install_property (
 		g_param_spec_boolean (
 			"disable-application-handlers",
 			NULL,
diff --git a/shell/e-shell.h b/shell/e-shell.h
index 16b26adce8..35095e1352 100644
--- a/shell/e-shell.h
+++ b/shell/e-shell.h
@@ -59,8 +59,6 @@ typedef struct _EShell EShell;
 typedef struct _EShellClass EShellClass;
 typedef struct _EShellPrivate EShellPrivate;
 
-typedef enum _EShellLineStatus EShellLineStatus;
-
 /**
  * EShell:
  *