diff --git a/res/layout-land/incall.xml b/res/layout-land/incall.xml
index c9085345f..adb5bb516 100644
--- a/res/layout-land/incall.xml
+++ b/res/layout-land/incall.xml
@@ -52,123 +52,123 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:visibility="gone"
-        android:gravity="right"
-        android:orientation="vertical" >
+        android:gravity="bottom"
+        android:orientation="horizontal" >
+
+        <ImageView
+            android:id="@+id/pause"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_pause"
+            android:scaleType="fitXY"
+            android:src="@drawable/pause_off" />
+           
+        <ImageView
+            android:id="@+id/conference"
+            android:visibility="gone"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_conference"
+            android:scaleType="fitXY"
+            android:src="@drawable/conference" />
 
         <TextView
-        	android:id="@+id/transfer"
-            android:background="@drawable/options_transfer"
-         	android:text="@string/button_transfer"
-         	android:gravity="center"
-         	android:paddingTop="50dp"
-         	android:textColor="@drawable/text_incall_button_color"
-            android:layout_width="wrap_content"
+        	android:id="@+id/video"
+        	android:background="@drawable/video_off"
+            android:text="@string/button_video"
+            android:gravity="center"
+            android:paddingTop="30dp"
+            android:textColor="@drawable/text_incall_button_color"
+        	android:layout_width="match_parent"
+       		android:layout_height="wrap_content"
+       		android:layout_weight="1" />
+
+       	<TextView
+        	android:id="@+id/micro"
+            android:background="@drawable/micro_on"
+            android:text="@string/button_micro"
+            android:gravity="center"
+            android:paddingTop="30dp"
+            android:textColor="@drawable/text_incall_button_color"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="invisible" />
+            android:layout_weight="1" />
+
+        <ImageView
+            android:id="@+id/hangUp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0.94"
+            android:adjustViewBounds="true"
+            android:contentDescription="@string/content_description_hang_up"
+            android:scaleType="fitXY"
+            android:src="@drawable/hangup" />
 
         <TextView
-            android:id="@+id/addCall"
-            android:background="@drawable/options_add_call_alt"
-         	android:text="@string/button_add_call"
-         	android:gravity="center"
-         	android:paddingTop="50dp"
-         	android:textColor="@drawable/text_incall_button_color"
-            android:layout_width="wrap_content"
+            android:id="@+id/speaker"
+            android:background="@drawable/speaker_off"
+            android:text="@string/button_speaker"
+            android:gravity="center"
+            android:paddingTop="30dp"
+            android:textColor="@drawable/text_incall_button_color"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="invisible" />
-            
+            android:layout_weight="1" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal" >
-
-            <ImageView
-                android:id="@+id/pause"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_pause"
-                android:scaleType="fitXY"
-                android:src="@drawable/pause_off" />
+            android:orientation="vertical"
+            android:layout_weight="1">
+              
+	        <TextView
+	        	android:id="@+id/transfer"
+	            android:background="@drawable/options_transfer"
+	         	android:text="@string/button_transfer"
+	         	android:gravity="center"
+	         	android:paddingTop="35dp"
+        		android:visibility="invisible"
+	         	android:textColor="@drawable/text_incall_button_color"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content" />
             
-            <ImageView
-                android:id="@+id/conference"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_conference"
-                android:scaleType="fitXY"
-                android:src="@drawable/conference" />
-
-            <TextView
-                android:id="@+id/video"
-                android:background="@drawable/video_off"
-	            android:text="@string/button_video"
+	        <TextView
+	            android:id="@+id/addCall"
+	            android:background="@drawable/options_add_call_alt"
+	         	android:text="@string/button_add_call"
+	         	android:gravity="center"
+	         	android:paddingTop="35dp"
+        		android:visibility="invisible"
+	         	android:textColor="@drawable/text_incall_button_color"
+	            android:layout_width="match_parent"
+	            android:layout_height="wrap_content" />
+              
+           <TextView
+               	android:id="@+id/options"
+               	android:background="@drawable/options"
+            	android:text="@string/button_options"
 	            android:gravity="center"
 	            android:paddingTop="30dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
+            	android:textColor="@drawable/text_incall_button_color"
+               	android:layout_width="match_parent"
+               	android:layout_height="wrap_content" />
+              	
+          </LinearLayout>
 
-            <TextView
-                android:id="@+id/micro"
-                android:background="@drawable/micro_on"
-	            android:text="@string/button_micro"
-	            android:gravity="center"
-	            android:paddingTop="30dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/hangUp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.94"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_hang_up"
-                android:scaleType="fitXY"
-                android:src="@drawable/hangup" />
-
-            <TextView
-                android:id="@+id/speaker"
-                android:background="@drawable/speaker_off"
-	            android:text="@string/button_speaker"
-	            android:gravity="center"
-	            android:paddingTop="30dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <TextView
-                android:id="@+id/options"
-                android:background="@drawable/options"
-	            android:text="@string/button_options"
-	            android:gravity="center"
-	            android:paddingTop="30dp"
-	            android:textColor="@drawable/text_incall_button_color"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-
-            <ImageView
-                android:id="@+id/dialer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_numpad"
-                android:scaleType="fitXY"
-                android:src="@drawable/dialer_alt" />
-            
-        </LinearLayout>
-        
-    </LinearLayout>
+          <ImageView
+              android:id="@+id/dialer"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_weight="1"
+              android:adjustViewBounds="true"
+              android:contentDescription="@string/content_description_numpad"
+              android:scaleType="fitXY"
+              android:src="@drawable/dialer_alt" />
+           
+       </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/incall.xml b/res/layout/incall.xml
index f1c8a9a24..671132a99 100644
--- a/res/layout/incall.xml
+++ b/res/layout/incall.xml
@@ -51,7 +51,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:visibility="gone"
+       	android:visibility="gone"
         android:gravity="right"
         android:orientation="vertical" >
 
@@ -60,18 +60,18 @@
            	android:background="@drawable/options_transfer"
         	android:text="@string/button_transfer"
         	android:gravity="center"
-        	android:paddingTop="50dp"
+        	android:paddingTop="40dp"
+           	android:visibility="invisible"
         	android:textColor="@drawable/text_incall_button_color"
            	android:layout_width="wrap_content"
-           	android:layout_height="wrap_content"
-           	android:visibility="invisible" />
+           	android:layout_height="wrap_content" />
 
        <TextView
 			android:id="@+id/addCall"
        		android:background="@drawable/options_add_call_alt"
         	android:text="@string/button_add_call"
         	android:gravity="center"
-        	android:paddingTop="50dp"
+        	android:paddingTop="40dp"
         	android:textColor="@drawable/text_incall_button_color"
            	android:layout_width="wrap_content"
            	android:layout_height="wrap_content"
@@ -130,6 +130,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+        	android:background="@android:color/black"
             android:orientation="horizontal" >
 
             <ImageView
diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java
index eec3babf1..a45f1af8a 100644
--- a/src/org/linphone/ChatStorage.java
+++ b/src/org/linphone/ChatStorage.java
@@ -215,7 +215,7 @@ public class ChatStorage {
 		ArrayList<String> chatList = new ArrayList<String>();
 		
 		Cursor c = db.query(TABLE_NAME, null, null, null, "remoteContact", null, "id DESC");
-		while (c.moveToNext()) {
+		while (c != null && c.moveToNext()) {
 			String remoteContact = c.getString(c.getColumnIndex("remoteContact"));
 			chatList.add(remoteContact);
 		}