diff --git a/Classes/ChatRoomViewController.m b/Classes/ChatRoomViewController.m
index c51b94ca7..aaadf0902 100644
--- a/Classes/ChatRoomViewController.m
+++ b/Classes/ChatRoomViewController.m
@@ -108,7 +108,7 @@ static UICompositeViewDescription *compositeDescription = nil;
                                                                  tabBar:/*@"UIMainBar"*/nil
                                                           tabBarEnabled:false /*to keep room for chat*/
                                                              fullscreen:false
-                                                          landscapeMode:true
+                                                          landscapeMode:[LinphoneManager runningOnIpad]
                                                            portraitMode:true];
     }
     return compositeDescription;
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index d360fa9b6..7e3b2bdff 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -193,14 +193,9 @@ static PhoneMainView* phoneMainViewInstance=nil;
     }
 }
 
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
-    if(interfaceOrientation == self.interfaceOrientation)
-        return YES;
-    return NO;
-}
 
 - (NSUInteger)supportedInterfaceOrientations {
-    return 0;
+    return UIInterfaceOrientationMaskPortrait;
 }
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration {