diff --git a/framework/res/xml/cordova.xml b/framework/res/xml/cordova.xml
index 8f347e7d..ddf30294 100644
--- a/framework/res/xml/cordova.xml
+++ b/framework/res/xml/cordova.xml
@@ -30,7 +30,7 @@
 	<!-- <access origin=".*"/> Allow all domains, suggested development use only -->
 
     <log level="DEBUG"/>
-    <preference name="classicRender" value="true" />
+    <preference name="useWebkitHistory" value="false" />
 </cordova>
 
 
diff --git a/framework/src/org/apache/cordova/CordovaWebView.java b/framework/src/org/apache/cordova/CordovaWebView.java
index 59785e8d..773f2b8b 100644
--- a/framework/src/org/apache/cordova/CordovaWebView.java
+++ b/framework/src/org/apache/cordova/CordovaWebView.java
@@ -51,6 +51,9 @@ public class CordovaWebView extends WebView {
 
   protected long loadUrlTimeoutValue;
 
+  //preferences read from cordova.xml
+  protected PreferenceSet preferences;
+  
   public CordovaWebView(Context context) {
     super(context);
     mCtx = context;
@@ -450,5 +453,59 @@ public class CordovaWebView extends WebView {
       }
   }
   
+  /**
+   * Load Cordova configuration from res/xml/cordova.xml.
+   * Approved list of URLs that can be loaded into DroidGap
+   *      <access origin="http://server regexp" subdomains="true" />
+   * Log level: ERROR, WARN, INFO, DEBUG, VERBOSE (default=ERROR)
+   *      <log level="DEBUG" />
+   */
+  private void loadConfiguration() {
+      int id = getResources().getIdentifier("cordova", "xml", mCtx.getPackageName());
+      if (id == 0) {
+          LOG.i("CordovaLog", "cordova.xml missing. Ignoring...");
+          return;
+      }
+      XmlResourceParser xml = getResources().getXml(id);
+      int eventType = -1;
+      while (eventType != XmlResourceParser.END_DOCUMENT) {
+          if (eventType == XmlResourceParser.START_TAG) {
+              String strNode = xml.getName();
+              if (strNode.equals("access")) {
+                  String origin = xml.getAttributeValue(null, "origin");
+                  String subdomains = xml.getAttributeValue(null, "subdomains");
+                  if (origin != null) {
+                      addWhiteListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                  }
+              }
+              else if (strNode.equals("log")) {
+                  String level = xml.getAttributeValue(null, "level");
+                  LOG.i("CordovaLog", "Found log level %s", level);
+                  if (level != null) {
+                      LOG.setLogLevel(level);
+                  }
+              }
+              else if (strNode.equals("preference")) {
+                  String name = xml.getAttributeValue(null, "name");
+                  String value = xml.getAttributeValue(null, "value");
+                  String readonlyString = xml.getAttributeValue(null, "readonly");
+
+                  boolean readonly = (readonlyString != null &&
+                                      readonlyString.equals("true"));
+
+                  LOG.i("CordovaLog", "Found preference for %s", name);
+
+                  preferences.add(new PreferenceNode(name, value, readonly));
+              }
+          }
+          try {
+              eventType = xml.next();
+          } catch (XmlPullParserException e) {
+              e.printStackTrace();
+          } catch (IOException e) {
+              e.printStackTrace();
+          }
+      }
+  }
   
 }
diff --git a/framework/src/org/apache/cordova/DroidGap.java b/framework/src/org/apache/cordova/DroidGap.java
index b40f7084..b084e5dc 100755
--- a/framework/src/org/apache/cordova/DroidGap.java
+++ b/framework/src/org/apache/cordova/DroidGap.java
@@ -1004,7 +1004,7 @@ public class DroidGap extends Activity implements CordovaInterface {
                     String origin = xml.getAttributeValue(null, "origin");
                     String subdomains = xml.getAttributeValue(null, "subdomains");
                     if (origin != null) {
-                        this.appView.addWhiteListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
+                        appView.addWhiteListEntry(origin, (subdomains != null) && (subdomains.compareToIgnoreCase("true") == 0));
                     }
                 }
                 else if (strNode.equals("log")) {