diff --git a/extras/pandroid_event_viewer/ChangeLog b/extras/pandroid_event_viewer/ChangeLog
index 4aaa665e71..abc5fab648 100644
--- a/extras/pandroid_event_viewer/ChangeLog
+++ b/extras/pandroid_event_viewer/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-25 Santiago Munín <burning1@gmail.com>
+	* src/pandroid_event_viewer/pandorafms/Main.java: Bug with api version detect solved.
+	* src/pandroid_event_viewer/pandorafms/EventList.java: Comments are cut when they're too long.
+
 2012-08-24 Santiago Munín <burning1@gmail.com>
 	* src/pandroid_event_viewer/pandorafms/Core.java: Fixed a bug (possible null argument as image).
 	* src/pandroid_event_viewer/pandorafms/EventList.java: Create incident is displayed as a dialog
diff --git a/extras/pandroid_event_viewer/res/layout/options.xml b/extras/pandroid_event_viewer/res/layout/options.xml
index afad572ba3..60eb9c0cc2 100644
--- a/extras/pandroid_event_viewer/res/layout/options.xml
+++ b/extras/pandroid_event_viewer/res/layout/options.xml
@@ -123,7 +123,8 @@
                             <Spinner
                                 android:id="@+id/refresh_combo"
                                 android:layout_width="wrap_content"
-                                android:layout_height="wrap_content" />
+                                android:layout_height="wrap_content"
+                                android:layout_weight="1" />
                         </LinearLayout>
 
                         <TextView
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
index d1122fd8c6..e30b991254 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/EventList.java
@@ -457,6 +457,10 @@ public class EventList extends ListActivity {
 					}
 
 					if (item.user_comment.length() != 0) {
+						if (item.user_comment.length()> 200) {
+							item.user_comment = item.user_comment.substring(0, 197);
+							item.user_comment = item.user_comment.concat("...");
+						}
 						text = (TextView) viewEventExtended
 								.findViewById(R.id.comments_text);
 						text.setText(item.user_comment);
diff --git a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
index 87ceac7367..f688ac6051 100644
--- a/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
+++ b/extras/pandroid_event_viewer/src/pandroid_event_viewer/pandorafms/Main.java
@@ -67,6 +67,7 @@ public class Main extends Activity {
 	private static String PROFILE_PREFIX = "profile:";
 	private static String DEFAULT_PROFILE_NAME = "Default";
 	private static String DEFAULT_PROFILE = "0|3||||0|6";
+	private static String VERSION_4_0_2_LABEL = "v4.0.2";
 	private PandroidEventviewerActivity object;
 	private HashMap<Integer, String> pandoraGroups;
 	private Spinner comboSeverity;
@@ -89,7 +90,8 @@ public class Main extends Activity {
 				this.getString(R.string.const_string_preferences),
 				Activity.MODE_PRIVATE);
 
-		if (preferences.getString("api_version", "v4.0.2").equals("v4.0.2")) {
+		if (preferences.getString("api_version", "")
+				.equals(VERSION_4_0_2_LABEL)) {
 			version402 = true;
 		}