diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index da88a08ed3..23bdbefdee 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-30 Santiago Munín <burning1@gmail.com>
+	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java, 
+	  src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Changed time measurement in the background check events.
+	* res/layout/create_incident.xml: Fixed a edittext's bad behavior (bad stretching).
+
 2012-07-14 Santiago Munín <burning1@gmail.com>
 	* src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java: Now uses the new getEvents() method in API class.
 
diff --git a/extras/pandroid_event_viewer/res/layout/create_incident.xml b/extras/pandroid_event_viewer/res/layout/create_incident.xml
index 2dbf58aa6c..5d858118f2 100644
--- a/extras/pandroid_event_viewer/res/layout/create_incident.xml
+++ b/extras/pandroid_event_viewer/res/layout/create_incident.xml
@@ -10,7 +10,7 @@
         android:layout_height="0dp"
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
-        android:layout_weight="9"
+        android:layout_weight="8"
         android:orientation="vertical"
         android:stretchColumns="1" >
 
@@ -24,14 +24,14 @@
                 style="@android:style/TextAppearance.Medium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:layout_marginRight="5dp"
                 android:text="@string/title" />
 
             <EditText
                 android:id="@+id/incident_title"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
                 android:inputType="text" />
         </TableRow>
 
@@ -45,105 +45,16 @@
                 style="@android:style/TextAppearance.Medium"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
                 android:layout_marginRight="5dp"
                 android:text="@string/description" />
 
             <EditText
                 android:id="@+id/incident_description"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
                 android:inputType="text" />
         </TableRow>
-        <!--
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp" >
-
-            <TextView
-                style="@android:style/TextAppearance.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="5dp"
-                android:text="@string/source" />
-
-            <Spinner
-                android:id="@+id/incident_source"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:entries="@array/incident_source" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp" >
-
-            <TextView
-                style="@android:style/TextAppearance.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="5dp"
-                android:text="@string/priority" />
-
-            <Spinner
-                android:id="@+id/incident_priority"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:entries="@array/incident_priority" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp" >
-
-            <TextView
-                style="@android:style/TextAppearance.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="5dp"
-                android:text="@string/status_label_str" />
-
-            <Spinner
-                android:id="@+id/incident_status"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:entries="@array/incident_status" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp" >
-
-            <TextView
-                style="@android:style/TextAppearance.Medium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginRight="5dp"
-                android:text="@string/group_label_str" />
-
-            <Spinner
-                android:id="@+id/incident_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-
-            <ProgressBar
-                android:id="@+id/loading_group"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-        </TableRow>
-        -->
     </TableLayout>
 
     <LinearLayout
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
index c085d3b5ff..cda337c2bc 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java
@@ -232,8 +232,8 @@ public class PandroidEventviewerActivity extends TabActivity implements
 		SharedPreferences preferences = getSharedPreferences(
 				getString(R.string.const_string_preferences),
 				Activity.MODE_PRIVATE);
-		long timestamp_notification = preferences.getLong("filterTimestamp",
-				(new Date().getTime() / 1000));
+		long timestamp_notification = preferences.getLong(
+				"new_events_last_timestamp", (new Date().getTime() / 1000));
 		Log.i(TAG + " process_notification_timestamp", ""
 				+ timestamp_notification);
 		this.timestamp = timestamp_notification;
@@ -252,11 +252,9 @@ public class PandroidEventviewerActivity extends TabActivity implements
 		Calendar c = Calendar.getInstance();
 		long now = (c.getTimeInMillis() / 1000);
 		SharedPreferences.Editor editorPreferences = preferences.edit();
-		// Save for the next execution
-		editorPreferences.putLong("filterTimestamp", now);
-		// Save the previous for the list.
-		editorPreferences.putLong("previous_filterTimestamp",
-				timestamp_notification);
+
+		editorPreferences.putLong("new_events_last_timestamp",
+				now);
 		if (editorPreferences.commit()) {
 			Log.i(TAG + " (filter options)",
 					"Configuration changes commited (timestamp)");
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java
index a7205a0366..0e2ee84580 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/PandroidEventviewerService.java
@@ -18,6 +18,7 @@ package pandroid_event_viewer.pandorafms;
 
 import java.io.IOException;
 import java.util.Calendar;
+import java.util.Date;
 
 import android.app.Activity;
 import android.app.IntentService;
@@ -78,10 +79,22 @@ public class PandroidEventviewerService extends IntentService {
 		SharedPreferences preferences = context.getSharedPreferences(
 				context.getString(R.string.const_string_preferences),
 				Activity.MODE_PRIVATE);
-		Calendar c = Calendar.getInstance();
-		long now = (c.getTimeInMillis() / 1000);
-		long old_previous_filterTimestamp = preferences.getLong(
-				"previous_filterTimestamp", now);
+		
+		long new_events_filterTimestamp = preferences.getLong(
+				"new_events_last_timestamp", 0);
+		Editor editor;
+		// Sets a default time
+		if (new_events_filterTimestamp == 0) {
+			editor = preferences.edit();
+			new_events_filterTimestamp = Calendar.getInstance()
+					.getTimeInMillis() / 1000;
+			editor.putLong("new_events_last_timestamp",
+					new_events_filterTimestamp);
+			editor.commit();
+
+		}
+		Log.d(TAG, "Retrieve events since: "
+				+ new Date(new_events_filterTimestamp * 1000).toString());
 		String filterAgentName = preferences.getString("filterAgentName", "");
 
 		int idGroup = preferences.getInt("filterIDGroup", 0);
@@ -90,13 +103,9 @@ public class PandroidEventviewerService extends IntentService {
 		String filterEventSearch = preferences.getString("filterEventSearch",
 				"");
 		String filterTag = preferences.getString("filterTag", "");
-
-		c = Calendar.getInstance();
-		now = (c.getTimeInMillis() / 1000);
-		long filterTimestamp = preferences.getLong("filterTimestamp", now);
 		String return_api = API.getEvents(this, filterAgentName, idGroup,
 				filterSeverity, filterStatus, filterEventSearch, filterTag,
-				filterTimestamp, 20, 0, true, false);
+				new_events_filterTimestamp, 20, 0, true, false);
 		return_api = return_api.replace("\n", "");
 		try {
 			this.count_events = Long.valueOf(return_api);
@@ -110,7 +119,7 @@ public class PandroidEventviewerService extends IntentService {
 			Log.i(TAG, "There are new events");
 			return_api = API.getEvents(this, filterAgentName, idGroup,
 					filterSeverity, filterStatus, filterEventSearch, filterTag,
-					filterTimestamp, 20, 0, false, true);
+					new_events_filterTimestamp, 20, 0, false, true);
 			return_api = return_api.replace("\n", "");
 			try {
 				this.more_criticity = Integer.valueOf(return_api).intValue();
@@ -122,19 +131,13 @@ public class PandroidEventviewerService extends IntentService {
 			// Don't repeat the same notification
 			if (lastCountEvents != count_events) {
 				notificationEvent(context);
-				Editor editor = preferences.edit();
+				editor = preferences.edit();
 				editor.putLong("last_count_events", count_events);
 				editor.commit();
 			}
 
 		} else {
 			this.more_criticity = -1;
-
-			// Restore timestamp
-			SharedPreferences.Editor editorPreferences = preferences.edit();
-			editorPreferences.putLong("previous_filterTimestamp",
-					old_previous_filterTimestamp);
-			editorPreferences.commit();
 		}
 		Log.d(TAG, "Check finished at "
 				+ Calendar.getInstance().getTime().toGMTString());