diff --git a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
index 4913e07b6..9e135b84a 100644
--- a/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/producteev/ProducteevLoginActivity.java
@@ -19,6 +19,8 @@
  */
 package com.todoroo.astrid.producteev;
 
+import java.util.TimeZone;
+
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
@@ -27,6 +29,7 @@ import android.os.Bundle;
 import android.text.Editable;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Spinner;
@@ -79,6 +82,21 @@ public class ProducteevLoginActivity extends Activity {
         final EditText emailEditText = (EditText) findViewById(R.id.email);
         final EditText passwordEditText = (EditText) findViewById(R.id.password);
         final View newUserLayout = findViewById(R.id.newUserLayout);
+        final Spinner timezoneList = (Spinner) findViewById(R.id.timezoneList);
+
+        String[] timezoneIds = TimeZone.getAvailableIDs();
+        String defaultTimeZone = TimeZone.getDefault().getID();
+        int selected = 0;
+        for(int i = 0; i < timezoneIds.length; i++) {
+            if(timezoneIds[i].equals(defaultTimeZone))
+                selected = i;
+        }
+
+        ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,
+                android.R.layout.simple_spinner_item, timezoneIds);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        timezoneList.setAdapter(adapter);
+        timezoneList.setSelection(selected);
 
         Button signIn = (Button) findViewById(R.id.signIn);
         signIn.setOnClickListener(new OnClickListener() {
@@ -112,7 +130,7 @@ public class ProducteevLoginActivity extends Activity {
                     Editable password = passwordEditText.getText();
                     Editable firstName = ((EditText)findViewById(R.id.firstName)).getText();
                     Editable lastName = ((EditText)findViewById(R.id.lastName)).getText();
-                    String timezone = ((Spinner)findViewById(R.id.timezoneList)).getSelectedItem().toString();
+                    String timezone = timezoneList.getSelectedItem().toString();
                     if(email.length() == 0 || password.length() == 0 ||
                             firstName.length() == 0 ||
                             lastName.length() == 0) {
@@ -146,7 +164,7 @@ public class ProducteevLoginActivity extends Activity {
                     Preferences.setString(R.string.producteev_PPr_password, password);
                     ProducteevUtilities.INSTANCE.setToken(invoker.getToken());
 
-                    FlurryAgent.onEvent("producteev-login");
+                    FlurryAgent.onEvent("producteev-login"); //$NON-NLS-1$
 
                     synchronize();
                 } catch (ApiAuthenticationException e) {
@@ -222,7 +240,10 @@ public class ProducteevLoginActivity extends Activity {
         FlurryAgent.onStartSession(this, Constants.FLURRY_KEY);
     }
 
-    private void onEn() {
+    @Override
+    protected void onStop() {
+        super.onStop();
         FlurryAgent.onEndSession(this);
     }
+
 }
\ No newline at end of file
diff --git a/astrid/res/layout/producteev_login_activity.xml b/astrid/res/layout/producteev_login_activity.xml
index efe102f2e..0919352c0 100644
--- a/astrid/res/layout/producteev_login_activity.xml
+++ b/astrid/res/layout/producteev_login_activity.xml
@@ -1,70 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent" android:layout_height="fill_parent"
-	android:orientation="vertical" android:background="@drawable/pdv_body">
-
-	<ImageView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:paddingTop="5dip"
-		android:paddingBottom="5dip" android:scaleType="fitCenter"
-		android:src="@drawable/pdv_logo" />
-
-	<TextView android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:gravity="center"
-		android:paddingBottom="10dip" android:textSize="16sp"
-		android:textColor="#ffffff" android:text="@string/producteev_PLA_body" />
-
-	<TextView android:id="@+id/error" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:gravity="center_horizontal"
-		android:paddingBottom="20dip" android:textColor="#ff0000"
-		android:textSize="16sp" android:textStyle="bold" android:visibility="gone" />
-
-	<EditText android:id="@+id/email" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:hint="@string/producteev_PLA_email"
-		android:contentDescription="E-Mail with which you registered to Producteev-service"
-		android:inputType="textEmailAddress" />
-
-	<EditText android:id="@+id/password" android:layout_height="wrap_content"
-		android:layout_width="fill_parent" android:contentDescription="Password for your Producteev account"
-		android:hint="@string/producteev_PLA_password" android:inputType="textPassword" />
-
-
-	<LinearLayout android:id="@+id/newUserLayout"
-		android:layout_width="fill_parent" android:layout_height="wrap_content"
-		android:orientation="vertical" android:paddingTop="20dip"
-		android:visibility="gone">
-
-		<EditText android:id="@+id/firstName" android:layout_height="wrap_content"
-			android:layout_width="fill_parent" android:hint="@string/producteev_PLA_firstName"
-			android:inputType="textPersonName" />
-
-		<EditText android:id="@+id/lastName" android:layout_height="wrap_content"
-			android:layout_width="fill_parent" android:hint="@string/producteev_PLA_lastName"
-			android:inputType="textPersonName" />
-
-		<Spinner android:layout_height="wrap_content"
-			android:layout_width="fill_parent" android:entries="@array/PLA_timezones_list"
-			android:id="@+id/timezoneList" android:contentDescription="@string/producteev_PLA_timezone" android:prompt="@string/producteev_PLA_timezone"/>
-
-	</LinearLayout>
-
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:orientation="horizontal"
-		android:paddingTop="5dip" android:baselineAligned="false">
-
-		<Button android:id="@+id/signIn" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:text="@string/producteev_PLA_signIn" />
-
-		<Button android:id="@+id/createNew" android:layout_width="fill_parent"
-			android:layout_height="wrap_content" android:layout_weight="1"
-			android:text="@string/producteev_PLA_createNew" />
-
-	</LinearLayout>
-
-
-	<TextView android:id="@+id/terms" android:layout_width="fill_parent"
-		android:layout_height="wrap_content" android:gravity="center"
-		android:paddingTop="10dip" android:textSize="16sp" android:textColor="#0000ff"
-		android:linksClickable="true" android:text="@string/producteev_PLA_terms" />
-
-</LinearLayout>
+<LinearLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:orientation="vertical"
+  android:background="@drawable/pdv_body">
+  <ImageView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:paddingTop="5dip"
+    android:paddingBottom="5dip"
+    android:scaleType="fitCenter"
+    android:src="@drawable/pdv_logo" />
+  <TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingBottom="10dip"
+    android:textSize="16sp"
+    android:textColor="#ffffff"
+    android:text="@string/producteev_PLA_body" />
+  <TextView
+    android:id="@+id/error"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:paddingBottom="20dip"
+    android:textColor="#ff0000"
+    android:textSize="16sp"
+    android:textStyle="bold"
+    android:visibility="gone" />
+  <EditText
+    android:id="@+id/email"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:hint="@string/producteev_PLA_email"
+    android:contentDescription="E-Mail with which you registered to Producteev-service"
+    android:inputType="textEmailAddress" />
+  <EditText
+    android:id="@+id/password"
+    android:layout_height="wrap_content"
+    android:layout_width="fill_parent"
+    android:contentDescription="Password for your Producteev account"
+    android:hint="@string/producteev_PLA_password"
+    android:inputType="textPassword" />
+  <LinearLayout
+    android:id="@+id/newUserLayout"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:paddingTop="20dip"
+    android:visibility="gone">
+    <EditText
+      android:id="@+id/firstName"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:hint="@string/producteev_PLA_firstName"
+      android:inputType="textPersonName" />
+    <EditText
+      android:id="@+id/lastName"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:hint="@string/producteev_PLA_lastName"
+      android:inputType="textPersonName" />
+    <Spinner
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:id="@+id/timezoneList"
+      android:contentDescription="@string/producteev_PLA_timezone"
+      android:prompt="@string/producteev_PLA_timezone" />
+  </LinearLayout>
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="horizontal"
+    android:paddingTop="5dip"
+    android:baselineAligned="false">
+    <Button
+      android:id="@+id/signIn"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/producteev_PLA_signIn" />
+    <Button
+      android:id="@+id/createNew"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/producteev_PLA_createNew" />
+  </LinearLayout>
+  <TextView
+    android:id="@+id/terms"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:paddingTop="10dip"
+    android:textSize="16sp"
+    android:textColor="#0000ff"
+    android:linksClickable="true"
+    android:text="@string/producteev_PLA_terms" />
+</LinearLayout>
\ No newline at end of file
diff --git a/astrid/res/values/timezones-producteev.xml b/astrid/res/values/timezones-producteev.xml
deleted file mode 100644
index 4ae8c3977..000000000
--- a/astrid/res/values/timezones-producteev.xml
+++ /dev/null
@@ -1,316 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<!-- list of allowed timezones for user-signup in producteev -->
-	<string-array name="PLA_timezones_list">
-		<item>Africa/Abidjan</item>
-		<item>Africa/Accra</item>
-		<item>Africa/Addis_Ababa</item>
-		<item>Africa/Algiers</item>
-		<item>Africa/Asmara</item>
-		<item>Africa/Bamako</item>
-		<item>Africa/Bangui</item>
-		<item>Africa/Banjul</item>
-		<item>Africa/Bissau</item>
-		<item>Africa/Blantyre</item>
-		<item>Africa/Brazzaville</item>
-		<item>Africa/Bujumbura</item>
-		<item>Africa/Cairo</item>
-		<item>Africa/Casablanca</item>
-		<item>Africa/Ceuta</item>
-		<item>Africa/Conakry</item>
-		<item>Africa/Dakar</item>
-		<item>Africa/Dar_es_Salaam</item>
-		<item>Africa/Djibouti</item>
-		<item>Africa/Douala</item>
-		<item>Africa/El_Aaiun</item>
-		<item>Africa/Freetown</item>
-		<item>Africa/Gaborone</item>
-		<item>Africa/Harare</item>
-		<item>Africa/Johannesburg</item>
-		<item>Africa/Kampala</item>
-		<item>Africa/Khartoum</item>
-		<item>Africa/Kigali</item>
-		<item>Africa/Kinshasa</item>
-		<item>Africa/Lagos</item>
-		<item>Africa/Libreville</item>
-		<item>Africa/Lome</item>
-		<item>Africa/Luanda</item>
-		<item>Africa/Lubumbashi</item>
-		<item>Africa/Lusaka</item>
-		<item>Africa/Malabo</item>
-		<item>Africa/Maputo</item>
-		<item>Africa/Maseru</item>
-		<item>Africa/Mbabane</item>
-		<item>Africa/Mogadishu</item>
-		<item>Africa/Monrovia</item>
-		<item>Africa/Nairobi</item>
-		<item>Africa/Ndjamena</item>
-		<item>Africa/Niamey</item>
-		<item>Africa/Nouakchott</item>
-		<item>Africa/Ouagadougou</item>
-		<item>Africa/Porto-Novo</item>
-		<item>Africa/Sao_Tome</item>
-		<item>Africa/Tripoli</item>
-		<item>Africa/Tunis</item>
-		<item>Africa/Windhoek</item>
-		<item>America/Anchorage</item>
-		<item>America/Anguilla</item>
-		<item>America/Antigua</item>
-		<item>America/Araguaina</item>
-		<item>America/Argentina/Buenos_Aires</item>
-		<item>America/Aruba</item>
-		<item>America/Asuncion</item>
-		<item>America/Bahia</item>
-		<item>America/Barbados</item>
-		<item>America/Belem</item>
-		<item>America/Belize</item>
-		<item>America/Boa_Vista</item>
-		<item>America/Bogota</item>
-		<item>America/Campo_Grande</item>
-		<item>America/Caracas</item>
-		<item>America/Cayenne</item>
-		<item>America/Cayman</item>
-		<item>America/Chicago</item>
-		<item>America/Costa_Rica</item>
-		<item>America/Cuiaba</item>
-		<item>America/Curacao</item>
-		<item>America/Danmarkshavn</item>
-		<item>America/Dawson_Creek</item>
-		<item>America/Denver</item>
-		<item>America/Dominica</item>
-		<item>America/Edmonton</item>
-		<item>America/El_Salvador</item>
-		<item>America/Fortaleza</item>
-		<item>America/Godthab</item>
-		<item>America/Grand_Turk</item>
-		<item>America/Grenada</item>
-		<item>America/Guadeloupe</item>
-		<item>America/Guatemala</item>
-		<item>America/Guayaquil</item>
-		<item>America/Guyana</item>
-		<item>America/Halifax</item>
-		<item>America/Havana</item>
-		<item>America/Hermosillo</item>
-		<item>America/Iqaluit</item>
-		<item>America/Jamaica</item>
-		<item>America/La_Paz</item>
-		<item>America/Lima</item>
-		<item>America/Los_Angeles</item>
-		<item>America/Maceio</item>
-		<item>America/Managua</item>
-		<item>America/Manaus</item>
-		<item>America/Martinique</item>
-		<item>America/Mazatlan</item>
-		<item>America/Mexico_City</item>
-		<item>America/Miquelon</item>
-		<item>America/Montevideo</item>
-		<item>America/Montreal</item>
-		<item>America/Montserrat</item>
-		<item>America/Nassau</item>
-		<item>America/New_York</item>
-		<item>America/Noronha</item>
-		<item>America/Panama</item>
-		<item>America/Paramaribo</item>
-		<item>America/Phoenix</item>
-		<item>America/Port_of_Spain</item>
-		<item>America/Port-au-Prince</item>
-		<item>America/Porto_Velho</item>
-		<item>America/Puerto_Rico</item>
-		<item>America/Recife</item>
-		<item>America/Regina</item>
-		<item>America/Rio_Branco</item>
-		<item>America/Santiago</item>
-		<item>America/Santo_Domingo</item>
-		<item>America/Sao_Paulo</item>
-		<item>America/Scoresbysund</item>
-		<item>America/St_Johns</item>
-		<item>America/St_Kitts</item>
-		<item>America/St_Lucia</item>
-		<item>America/St_Thomas</item>
-		<item>America/St_Vincent</item>
-		<item>America/Tegucigalpa</item>
-		<item>America/Thule</item>
-		<item>America/Tijuana</item>
-		<item>America/Toronto</item>
-		<item>America/Tortola</item>
-		<item>America/Vancouver</item>
-		<item>America/Whitehorse</item>
-		<item>America/Winnipeg</item>
-		<item>America/Yellowknife</item>
-		<item>Antarctica/Casey</item>
-		<item>Antarctica/Davis</item>
-		<item>Antarctica/DumontDUrville</item>
-		<item>Antarctica/Mawson</item>
-		<item>Antarctica/Palmer</item>
-		<item>Antarctica/Rothera</item>
-		<item>Antarctica/Syowa</item>
-		<item>Antarctica/Vostok</item>
-		<item>Asia/Aden</item>
-		<item>Asia/Almaty</item>
-		<item>Asia/Amman</item>
-		<item>Asia/Aqtau</item>
-		<item>Asia/Aqtobe</item>
-		<item>Asia/Ashgabat</item>
-		<item>Asia/Baghdad</item>
-		<item>Asia/Bahrain</item>
-		<item>Asia/Baku</item>
-		<item>Asia/Bangkok</item>
-		<item>Asia/Beirut</item>
-		<item>Asia/Bishkek</item>
-		<item>Asia/Brunei</item>
-		<item>Asia/Calcutta</item>
-		<item>Asia/Choibalsan</item>
-		<item>Asia/Colombo</item>
-		<item>Asia/Damascus</item>
-		<item>Asia/Dhaka</item>
-		<item>Asia/Dili</item>
-		<item>Asia/Dubai</item>
-		<item>Asia/Dushanbe</item>
-		<item>Asia/Gaza</item>
-		<item>Asia/Hong_Kong</item>
-		<item>Asia/Hovd</item>
-		<item>Asia/Irkutsk</item>
-		<item>Asia/Jakarta</item>
-		<item>Asia/Jayapura</item>
-		<item>Asia/Jerusalem</item>
-		<item>Asia/Kabul</item>
-		<item>Asia/Kamchatka</item>
-		<item>Asia/Karachi</item>
-		<item>Asia/Katmandu</item>
-		<item>Asia/Krasnoyarsk</item>
-		<item>Asia/Kuala_Lumpur</item>
-		<item>Asia/Kuwait</item>
-		<item>Asia/Macau</item>
-		<item>Asia/Magadan</item>
-		<item>Asia/Makassar</item>
-		<item>Asia/Manila</item>
-		<item>Asia/Muscat</item>
-		<item>Asia/Nicosia</item>
-		<item>Asia/Omsk</item>
-		<item>Asia/Phnom_Penh</item>
-		<item>Asia/Pyongyang</item>
-		<item>Asia/Qatar</item>
-		<item>Asia/Rangoon</item>
-		<item>Asia/Riyadh</item>
-		<item>Asia/Saigon</item>
-		<item>Asia/Seoul</item>
-		<item>Asia/Shanghai</item>
-		<item>Asia/Singapore</item>
-		<item>Asia/Taipei</item>
-		<item>Asia/Tashkent</item>
-		<item>Asia/Tbilisi</item>
-		<item>Asia/Tehran</item>
-		<item>Asia/Thimphu</item>
-		<item>Asia/Tokyo</item>
-		<item>Asia/Ulaanbaatar</item>
-		<item>Asia/Vientiane</item>
-		<item>Asia/Vladivostok</item>
-		<item>Asia/Yakutsk</item>
-		<item>Asia/Yekaterinburg</item>
-		<item>Asia/Yerevan</item>
-		<item>Atlantic/Azores</item>
-		<item>Atlantic/Bermuda</item>
-		<item>Atlantic/Canary</item>
-		<item>Atlantic/Cape_Verde</item>
-		<item>Atlantic/Faroe</item>
-		<item>Atlantic/Reykjavik</item>
-		<item>Atlantic/South_Georgia</item>
-		<item>Atlantic/St_Helena</item>
-		<item>Atlantic/Stanley</item>
-		<item>Australia/Adelaide</item>
-		<item>Australia/Brisbane</item>
-		<item>Australia/Darwin</item>
-		<item>Australia/Hobart</item>
-		<item>Australia/Perth</item>
-		<item>Australia/Sydney</item>
-		<item>Etc/GMT</item>
-		<item>Europe/Amsterdam</item>
-		<item>Europe/Andorra</item>
-		<item>Europe/Athens</item>
-		<item>Europe/Belgrade</item>
-		<item>Europe/Berlin</item>
-		<item>Europe/Brussels</item>
-		<item>Europe/Bucharest</item>
-		<item>Europe/Budapest</item>
-		<item>Europe/Chisinau</item>
-		<item>Europe/Copenhagen</item>
-		<item>Europe/Dublin</item>
-		<item>Europe/Gibraltar</item>
-		<item>Europe/Helsinki</item>
-		<item>Europe/Istanbul</item>
-		<item>Europe/Kaliningrad</item>
-		<item>Europe/Kiev</item>
-		<item>Europe/Lisbon</item>
-		<item>Europe/London</item>
-		<item>Europe/Luxembourg</item>
-		<item>Europe/Madrid</item>
-		<item>Europe/Malta</item>
-		<item>Europe/Minsk</item>
-		<item>Europe/Monaco</item>
-		<item>Europe/Moscow</item>
-		<item>Europe/Oslo</item>
-		<item>Europe/Paris</item>
-		<item>Europe/Prague</item>
-		<item>Europe/Riga</item>
-		<item>Europe/Rome</item>
-		<item>Europe/Samara</item>
-		<item>Europe/Sofia</item>
-		<item>Europe/Stockholm</item>
-		<item>Europe/Tallinn</item>
-		<item>Europe/Tirane</item>
-		<item>Europe/Vaduz</item>
-		<item>Europe/Vienna</item>
-		<item>Europe/Vilnius</item>
-		<item>Europe/Warsaw</item>
-		<item>Europe/Zurich</item>
-		<item>Indian/Antananarivo</item>
-		<item>Indian/Chagos</item>
-		<item>Indian/Christmas</item>
-		<item>Indian/Cocos</item>
-		<item>Indian/Comoro</item>
-		<item>Indian/Kerguelen</item>
-		<item>Indian/Mahe</item>
-		<item>Indian/Maldives</item>
-		<item>Indian/Mauritius</item>
-		<item>Indian/Mayotte</item>
-		<item>Indian/Reunion</item>
-		<item>Pacific/Apia</item>
-		<item>Pacific/Auckland</item>
-		<item>Pacific/Easter</item>
-		<item>Pacific/Efate</item>
-		<item>Pacific/Enderbury</item>
-		<item>Pacific/Fakaofo</item>
-		<item>Pacific/Fiji</item>
-		<item>Pacific/Funafuti</item>
-		<item>Pacific/Galapagos</item>
-		<item>Pacific/Gambier</item>
-		<item>Pacific/Guadalcanal</item>
-		<item>Pacific/Guam</item>
-		<item>Pacific/Honolulu</item>
-		<item>Pacific/Johnston</item>
-		<item>Pacific/Kiritimati</item>
-		<item>Pacific/Kosrae</item>
-		<item>Pacific/Kwajalein</item>
-		<item>Pacific/Majuro</item>
-		<item>Pacific/Marquesas</item>
-		<item>Pacific/Midway</item>
-		<item>Pacific/Nauru</item>
-		<item>Pacific/Niue</item>
-		<item>Pacific/Norfolk</item>
-		<item>Pacific/Noumea</item>
-		<item>Pacific/Pago_Pago</item>
-		<item>Pacific/Palau</item>
-		<item>Pacific/Pitcairn</item>
-		<item>Pacific/Ponape</item>
-		<item>Pacific/Port_Moresby</item>
-		<item>Pacific/Rarotonga</item>
-		<item>Pacific/Saipan</item>
-		<item>Pacific/Tahiti</item>
-		<item>Pacific/Tarawa</item>
-		<item>Pacific/Tongatapu</item>
-		<item>Pacific/Truk</item>
-		<item>Pacific/Wake</item>
-		<item>Pacific/Wallis</item>
-		<item>US/Eastern</item>
-	</string-array>
-</resources>