--- a/mobile/android/base/PromptService.java
+++ b/mobile/android/base/PromptService.java
@@ -17,16 +17,17 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.DialogInterface.OnClickListener;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.text.InputType;
+import android.text.format.DateFormat;
 import android.util.Log;
 import android.view.inputmethod.InputMethodManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
@@ -153,16 +154,17 @@ public class PromptService implements On
                     view = (View)input;
                 }
             } else if (type.equals("week")) {
                 DateTimePicker input = new DateTimePicker(GeckoApp.mAppContext, "yyyy-'W'ww", value,
                                                           DateTimePicker.pickersState.WEEK);
                 view = (View)input;
             } else if (type.equals("time")) {
                 TimePicker input = new TimePicker(GeckoApp.mAppContext);
+                input.setIs24HourView(DateFormat.is24HourFormat(GeckoApp.mAppContext));
                 if (!value.equals("")) {
                     try {
                         GregorianCalendar calendar = new GregorianCalendar();
                         calendar.setTime(new SimpleDateFormat("kk:mm").parse(value));
                         input.setCurrentHour(calendar.get(GregorianCalendar.HOUR_OF_DAY));
                         input.setCurrentMinute(calendar.get(GregorianCalendar.MINUTE));
                     } catch (Exception e) { }
                 }