diff --git a/MyTracks/res/layout/mytracks_list.xml b/MyTracks/res/layout/mytracks_list.xml
index ec1e189cb..720984dd8 100644
--- a/MyTracks/res/layout/mytracks_list.xml
+++ b/MyTracks/res/layout/mytracks_list.xml
@@ -50,6 +50,12 @@ limitations under the License.
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_weight="1"/>
+    <Button android:id="@+id/tracklist_btn_import_all"
+      android:layout_width="wrap_content"
+      android:layout_height="48dip"
+      android:layout_gravity="left|top"
+      android:text="@string/tracklist_btn_import_all"
+      android:textSize="14dip"/>
     <Button android:id="@+id/tracklist_btn_export_all"
       android:layout_width="wrap_content"
       android:layout_height="48dip"
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 9b5d4a24f..bd8063280 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -125,9 +125,9 @@ limitations under the License.
   <string name="tracklist_save_as_csv">Save a CSV file</string>
   <string name="tracklist_save_as_tcx">Save a TCX file</string>
   <string name="tracklist_btn_send_all_to_fusiontables">Send to Google Fusion Tables</string>
-  <string name="tracklist_btn_delete_all">Delete all tracks</string>
+  <string name="tracklist_btn_delete_all">Delete all</string>
   <!-- Export All -->
-  <string name="tracklist_btn_export_all">Export all tracks</string>
+  <string name="tracklist_btn_export_all">Export all</string>
   <string name="export_done">Export finished</string>
   <string name="tracklist_pick_one">Pick a track. Press&amp;hold for more options.</string>
   <string name="tracklist_all_tracks">All Tracks:</string>
@@ -139,6 +139,17 @@ limitations under the License.
   <string name="tracklist_share_csv_file">A CSV file</string>
   <string name="tracklist_share_tcx_file">A TCX file</string>
   <string name="tracklist_clear_map">Clear map</string>
+  <!-- Import All -->
+  <string name="tracklist_btn_import_all">Import all</string>
+  <string name="import_done">Import finished, imported</string>
+  <!-- Format:
+  $1 : Successful imports
+  $2 : Attempted imports
+  $3 : MyTracks gpx path
+  -->
+  <string name="import_done">Imported %1$d of %2$d GPX files from %3$s</string>
+  <string name="import_empty">No GPX files found in %s. SD card may be unreadable or directory may not contain GPX files.</string>
+  <string name="import_error">Import error for file %s</string>
 
   <!-- Waypoints list -->
   <string name="waypointslist_btn_delete_all">Delete all markers</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index 1eb86831a..86c5bc9cf 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -20,18 +20,17 @@ import com.google.android.apps.mytracks.content.TracksColumns;
 import com.google.android.apps.mytracks.io.TrackWriter;
 import com.google.android.apps.mytracks.io.TrackWriterFactory;
 import com.google.android.apps.mytracks.io.TrackWriterFactory.TrackFileFormat;
+import com.google.android.apps.mytracks.util.MyTracksUtils;
 import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import android.widget.Toast;
@@ -121,7 +120,7 @@ public class ExportAllTracks {
     	  prefs.getLong(activity.getString(R.string.recording_track_key), -1);
     }
     if (recordingTrackId != -1) {
-      acquireWakeLock();
+      wakeLock = MyTracksUtils.acquireWakeLock(activity, wakeLock);
     }
 
     // Now we can safely export everything.
@@ -211,40 +210,4 @@ public class ExportAllTracks {
       }
     }
   }
-
-  /**
-   * Tries to acquire a partial wake lock if not already acquired. Logs errors
-   * and gives up trying in case the wake lock cannot be acquired.
-   */
-  private void acquireWakeLock() {
-    Log.i(MyTracksConstants.TAG, "ExportAllTracks: Aquiring wake lock.");
-    try {
-      PowerManager pm =
-          (PowerManager) activity.getSystemService(Context.POWER_SERVICE);
-      if (pm == null) {
-        Log.e(MyTracksConstants.TAG,
-            "ExportAllTracks: Power manager not found!");
-        return;
-      }
-      if (wakeLock == null) {
-        wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
-            MyTracksConstants.TAG);
-        if (wakeLock == null) {
-          Log.e(MyTracksConstants.TAG,
-              "ExportAllTracks: Could not create wake lock (null).");
-          return;
-        }
-      }
-      if (!wakeLock.isHeld()) {
-        wakeLock.acquire();
-        if (!wakeLock.isHeld()) {
-          Log.e(MyTracksConstants.TAG,
-              "ExportAllTracks: Could not acquire wake lock.");
-        }
-      }
-    } catch (RuntimeException e) {
-      Log.e(MyTracksConstants.TAG,
-          "ExportAllTracks: Caught unexpected exception: " + e.getMessage(), e);
-    }
-  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
new file mode 100644
index 000000000..799a91d5a
--- /dev/null
+++ b/MyTracks/src/com/google/android/apps/mytracks/ImportAllTracks.java
@@ -0,0 +1,217 @@
+/*
+ * Copyright 2011 Google Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks;
+
+import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
+import com.google.android.apps.mytracks.io.GpxImporter;
+import com.google.android.apps.mytracks.util.FileUtils;
+import com.google.android.apps.mytracks.util.MyTracksUtils;
+import com.google.android.maps.mytracks.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.ProgressDialog;
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.PowerManager.WakeLock;
+import android.util.Log;
+import android.widget.Toast;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.xml.sax.SAXException;
+
+/**
+ * A class that will import all GPX tracks in /sdcard/MyTracks/gpx/
+ * 
+ * @author David Piggott
+ */
+public class ImportAllTracks {
+
+  private final Activity activity;
+  private WakeLock wakeLock;
+  private ProgressDialog progress;
+  private FileUtils fileUtils;
+  private String gpxPath;
+  private int gpxFileCount;
+  private int importSuccessCount;
+
+  public ImportAllTracks(Activity activity) {
+    this.activity = activity;
+    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Starting");
+    fileUtils = new FileUtils();
+    gpxPath = fileUtils.buildExternalDirectoryPath("gpx");
+    HandlerThread handlerThread;
+    Handler handler;
+    handlerThread = new HandlerThread("ImportAllTracks");
+    handlerThread.start();
+    handler = new Handler(handlerThread.getLooper());
+    handler.post(runner);
+  }
+
+  private final Runnable runner = new Runnable() {
+    public void run() {
+      aquireLocksAndImport();
+    }
+  };
+
+  /**
+   * Makes sure that we keep the phone from sleeping. See if there is a current
+   * track. Acquire a wake lock if there is no current track.
+   */
+  private void aquireLocksAndImport() {
+    SharedPreferences prefs = activity.getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
+    long recordingTrackId = -1;
+    if (prefs != null) {
+      recordingTrackId = prefs.getLong(activity.getString(R.string.recording_track_key), -1);
+    }
+    if (recordingTrackId != -1) {
+      wakeLock = MyTracksUtils.acquireWakeLock(activity, wakeLock);
+    }
+
+    // Now we can safely import everything.
+    importAll();
+
+    // Release the wake lock if we acquired one.
+    // TODO check what happens if we started recording after getting this lock.
+    if (wakeLock != null && wakeLock.isHeld()) {
+      wakeLock.release();
+      Log.i(MyTracksConstants.TAG, "ImportAllTracks: Releasing wake lock.");
+    }
+
+    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Done");
+    AlertDialog.Builder builder = new AlertDialog.Builder(activity);
+    if (gpxFileCount == 0) {
+      builder.setMessage(activity.getString(R.string.import_empty, gpxPath + "/"));
+    } else {
+      builder.setMessage(activity.getString(R.string.import_done, importSuccessCount, gpxFileCount,
+          gpxPath + "/"));
+    }
+    builder.setPositiveButton(R.string.ok, null);
+    builder.show();
+  }
+
+  private void makeProgressDialog(final int trackCount) {
+    String importMsg = activity.getString(R.string.tracklist_btn_import_all);
+    progress = new ProgressDialog(activity);
+    progress.setIcon(android.R.drawable.ic_dialog_info);
+    progress.setTitle(importMsg);
+    progress.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
+    progress.setMax(trackCount);
+    progress.setProgress(0);
+    progress.show();
+  }
+
+  /**
+   * Actually import the tracks. This should be called after the wake locks have
+   * been acquired.
+   */
+  private void importAll() {
+    MyTracksProviderUtils providerUtils = MyTracksProviderUtils.Factory.get(activity);
+
+    if (!fileUtils.isSdCardAvailable()) {
+      return;
+    }
+
+    List<File> gpxFiles = getGpxFiles();
+    gpxFileCount = gpxFiles.size();
+    if (gpxFileCount == 0) {
+      return;
+    }
+
+    Log.i(MyTracksConstants.TAG, "ImportAllTracks: Importing: " + gpxFileCount + " tracks.");
+    activity.runOnUiThread(new Runnable() {
+      public void run() {
+        makeProgressDialog(gpxFileCount);
+      }
+    });
+
+    Iterator<File> gpxFilesIterator = gpxFiles.iterator();
+    for (int currentFileNumber = 0; gpxFilesIterator.hasNext(); currentFileNumber++) {
+      File currentFile = gpxFilesIterator.next();
+      final int status = currentFileNumber;
+      activity.runOnUiThread(new Runnable() {
+        public void run() {
+          synchronized (this) {
+            if (progress == null) {
+              return;
+            }
+            progress.setProgress(status);
+          }
+        }
+      });
+      if (importFile(currentFile, providerUtils)) {
+        importSuccessCount++;
+      }
+    }
+
+    if (progress != null) {
+      synchronized (this) {
+        progress.dismiss();
+        progress = null;
+      }
+    }
+  }
+
+  /**
+   * Attempts to import a GPX file. Returns true on success, issues error
+   * notifications and returns false on failure.
+   */
+  private boolean importFile(File gpxFile, MyTracksProviderUtils providerUtils) {
+    Log.i(MyTracksConstants.TAG, "ImportAllTracks: importing: " + gpxFile.getName());
+    try {
+      GpxImporter.importGPXFile(new FileInputStream(gpxFile), providerUtils);
+      return true;
+    } catch (FileNotFoundException e) {
+      Log.w(MyTracksConstants.TAG, "GPX file wasn't found/went missing: "
+          + gpxFile.getAbsolutePath(), e);
+    } catch (ParserConfigurationException e) {
+      Log.w(MyTracksConstants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
+    } catch (SAXException e) {
+      Log.w(MyTracksConstants.TAG, "Error parsing file: " + gpxFile.getAbsolutePath(), e);
+    } catch (IOException e) {
+      Log.w(MyTracksConstants.TAG, "Error reading file: " + gpxFile.getAbsolutePath(), e);
+    }
+    Toast.makeText(activity, activity.getString(R.string.import_error, gpxFile.getName()),
+        Toast.LENGTH_LONG).show();
+    return false;
+  }
+
+  /**
+   * Returns a list of the GPX Files found in the GPX directory.
+   */
+  private List<File> getGpxFiles() {
+    List<File> gpxFiles = new LinkedList<File>();
+    File[] gpxFileCandidates = new File(gpxPath).listFiles();
+    if (gpxFileCandidates != null) {
+      for (File file : gpxFileCandidates) {
+        if (!file.isDirectory() && file.getName().endsWith(".gpx")) {
+          gpxFiles.add(file);
+        }
+      }
+    }
+    return gpxFiles;
+  }
+}
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
index aecda4b3d..ded2aae1b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MenuManager.java
@@ -42,7 +42,7 @@ class MenuManager {
 
   public void onPrepareOptionsMenu(Menu menu, boolean hasRecorded,
       boolean isRecording, boolean hasSelectedTrack) {
-    menu.findItem(R.id.menu_list_tracks).setEnabled(hasRecorded);
+    menu.findItem(R.id.menu_list_tracks);
     menu.findItem(R.id.menu_list_markers)
         .setEnabled(hasRecorded && hasSelectedTrack);
     menu.findItem(R.id.menu_start_recording)
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java
index 79f295b2e..6fe18df2a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracksList.java
@@ -178,6 +178,10 @@ public class MyTracksList extends ListActivity
         new ExportAllTracks(this);
         break;
       }
+      case R.id.tracklist_btn_import_all: {
+        new ImportAllTracks(this);
+        break;
+      }
     }
   }
 
@@ -195,6 +199,7 @@ public class MyTracksList extends ListActivity
 
     findViewById(R.id.tracklist_btn_delete_all).setOnClickListener(this);
     findViewById(R.id.tracklist_btn_export_all).setOnClickListener(this);
+    findViewById(R.id.tracklist_btn_import_all).setOnClickListener(this);
 
     SharedPreferences preferences =
         getSharedPreferences(MyTracksSettings.SETTINGS_NAME, 0);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/util/MyTracksUtils.java b/MyTracks/src/com/google/android/apps/mytracks/util/MyTracksUtils.java
index 4d6da6786..59ba09b3d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/util/MyTracksUtils.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/util/MyTracksUtils.java
@@ -21,12 +21,15 @@ import com.google.android.apps.mytracks.stats.TripStatistics;
 
 import com.google.android.maps.GeoPoint;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.Signature;
 import android.location.Location;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
 import java.util.ArrayList;
@@ -286,6 +289,42 @@ public class MyTracksUtils {
       return "";
     }
   }
+  
+  /**
+   * Tries to acquire a partial wake lock if not already acquired. Logs errors
+   * and gives up trying in case the wake lock cannot be acquired.
+   */
+  public static WakeLock acquireWakeLock(Activity activity, WakeLock wakeLock) {
+    Log.i(MyTracksConstants.TAG, "MyTracksUtils: Acquiring wake lock.");
+    try {
+      PowerManager pm = (PowerManager) activity
+          .getSystemService(Context.POWER_SERVICE);
+      if (pm == null) {
+        Log.e(MyTracksConstants.TAG, "MyTracksUtils: Power manager not found!");
+        return wakeLock;
+      }
+      if (wakeLock == null) {
+        wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,
+            MyTracksConstants.TAG);
+        if (wakeLock == null) {
+          Log.e(MyTracksConstants.TAG,
+              "MyTracksUtils: Could not create wake lock (null).");
+        }
+        return wakeLock;
+      }
+      if (!wakeLock.isHeld()) {
+        wakeLock.acquire();
+        if (!wakeLock.isHeld()) {
+          Log.e(MyTracksConstants.TAG,
+              "MyTracksUtils: Could not acquire wake lock.");
+        }
+      }
+    } catch (RuntimeException e) {
+      Log.e(MyTracksConstants.TAG,
+          "MyTracksUtils: Caught unexpected exception: " + e.getMessage(), e);
+    }
+    return wakeLock;
+  }
 
   /**
    * This is a utility class w/ only static members.