Index: src/trackerd/tracker-utils.c
===================================================================
--- src/trackerd/tracker-utils.c	(revision 587)
+++ src/trackerd/tracker-utils.c	(working copy)
@@ -2159,7 +2159,9 @@ tracker_load_config_file ()
 		contents  = g_strconcat (						
 					 "[General]\n",
 					 "# Log Verbosity - Valid values are 0 (displays/logs only errors), 1 (minimal), 2 (detailed), and 3 (debug)\n",
-					 "Verbosity=0\n\n",
+					 "Verbosity=0\n",
+					 "# Minimizes the use of memory but may slow indexing down\n", 
+					 "Low memory mode=false\n\n",
 					 "[Watches]\n",
 					 "# List of directory roots to index and watch seperated by semicolons\n",
 					 "WatchDirectoryRoots=", g_get_home_dir (), ";\n",
@@ -2219,6 +2221,17 @@ tracker_load_config_file ()
 		tracker->verbosity = g_key_file_get_integer (key_file, "General", "Verbosity", NULL);
 	}
 
+	if (g_key_file_has_key (key_file, "General", "Low memory mode", NULL)) {
+		tracker->use_extra_memory = g_key_file_get_boolean (key_file, "General", "Low memory mode", NULL);
+	}
+
+    if (tracker->use_extra_memory) {
+        tracker->use_extra_memory = FALSE;
+     }
+        
+    else {
+        tracker->use_extra_memory = TRUE;
+    }
 	
 	/* Watch options */