diff --git a/scripts/app_engine_server/memcache_zipserve.py b/scripts/app_engine_server/memcache_zipserve.py
index dfd7de9d0..9c6f42e5b 100644
--- a/scripts/app_engine_server/memcache_zipserve.py
+++ b/scripts/app_engine_server/memcache_zipserve.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Copyright 2009 Google Inc.
 #
@@ -526,6 +527,10 @@ class MemcachedZipHandler(webapp.RequestHandler):
     resp_data = None
     file_itr = iter(self.zipfilenames)
 
+    # decode any escape characters in the URI
+    # Note: We are currenty just looking for '@' (%40)
+    file_path = file_path.replace('%40', '@')
+
     # check the index, if we have one, to see what archive the file is in
     archive_name = self.MapFileToArchive(file_path)
     if not archive_name: