diff --git a/Vector/ViewController/RoomViewController.m b/Vector/ViewController/RoomViewController.m
index 45ca32d8c..61df580b9 100644
--- a/Vector/ViewController/RoomViewController.m
+++ b/Vector/ViewController/RoomViewController.m
@@ -233,8 +233,11 @@
     
     if (self.roomDataSource)
     {
-       // this room view controller has its own typing management.
-       self.roomDataSource.showTypingNotifications = NO;
+        // this room view controller has its own typing management.
+        self.roomDataSource.showTypingNotifications = NO;
+        
+        // Check whether call option is supported
+        ((RoomInputToolbarView*)self.inputToolbarView).supportCallOption = (self.roomDataSource.mxSession.callManager != nil);
     }
 }
 
@@ -342,6 +345,12 @@
     {
         customizedRoomDataSource = (RoomDataSource*)dataSource;
     }
+    
+    if (self.inputToolbarView && [self.inputToolbarView isKindOfClass:RoomInputToolbarView.class])
+    {
+        // Update call option support
+        ((RoomInputToolbarView*)self.inputToolbarView).supportCallOption = (dataSource.mxSession.callManager != nil);
+    }
 }
 
 - (void)updateViewControllerAppearanceOnRoomDataSourceState
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
index 96b3af4df..6e27e2de7 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.h
@@ -37,4 +37,11 @@
 @property (weak, nonatomic) IBOutlet UIButton *attachMediaButton;
 @property (weak, nonatomic) IBOutlet UIButton *voiceCallButton;
 
+@property (weak, nonatomic) IBOutlet NSLayoutConstraint *voiceCallButtonWidthConstraint;
+
+/**
+ Tell whether the call option is supported. YES by default.
+ */
+@property (nonatomic) BOOL supportCallOption;
+
 @end
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
index 13fac34a1..1724baa80 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.m
@@ -56,6 +56,8 @@
     // Remove default toolbar background color
     self.backgroundColor = [UIColor clearColor];
     
+    _supportCallOption = YES;
+    
     self.rightInputToolbarButton.hidden = YES;
     
     self.separatorView.backgroundColor = kVectorColorSiver;
@@ -71,6 +73,25 @@
     self.placeholder = NSLocalizedStringFromTable(@"room_message_placeholder", @"Vector", nil);
 }
 
+- (void)setSupportCallOption:(BOOL)supportCallOption
+{
+    if (_supportCallOption != supportCallOption)
+    {
+        _supportCallOption = supportCallOption;
+        
+        if (supportCallOption)
+        {
+            self.voiceCallButtonWidthConstraint.constant = 46;
+        }
+        else
+        {
+            self.voiceCallButtonWidthConstraint.constant = 0;
+        }
+        
+        [self setNeedsUpdateConstraints];
+    }
+}
+
 #pragma mark - HPGrowingTextView delegate
 
 //- (BOOL)growingTextViewShouldReturn:(HPGrowingTextView *)hpGrowingTextView
diff --git a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
index 8ae6ef9c9..4add0b805 100644
--- a/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
+++ b/Vector/Views/RoomInputToolbar/RoomInputToolbarView.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9532" systemVersion="15C50" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
     </dependencies>
     <objects>
@@ -58,8 +58,9 @@
                             </connections>
                         </button>
                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hga-l8-Wua" userLabel="attach Button">
-                            <rect key="frame" x="507" y="0.0" width="46" height="46"/>
+                            <rect key="frame" x="508" y="0.0" width="46" height="46"/>
                             <constraints>
+                                <constraint firstAttribute="width" constant="46" id="O2T-T8-EjV"/>
                                 <constraint firstAttribute="width" secondItem="Hga-l8-Wua" secondAttribute="height" multiplier="1:1" id="f0T-3f-BJu"/>
                             </constraints>
                             <state key="normal" image="upload_icon.png"/>
@@ -89,7 +90,7 @@
                         <constraint firstItem="G8Z-CM-tGs" firstAttribute="top" secondItem="a84-Vc-6ud" secondAttribute="top" id="8cV-eb-Kog"/>
                         <constraint firstItem="3ln-yI-ef9" firstAttribute="leading" secondItem="a84-Vc-6ud" secondAttribute="leading" constant="10" id="BwP-sF-qE1"/>
                         <constraint firstItem="QWp-NV-uh5" firstAttribute="leading" secondItem="a84-Vc-6ud" secondAttribute="leading" constant="56" id="ErD-eB-stF"/>
-                        <constraint firstItem="Owf-M8-qJi" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" constant="1" id="GKh-R5-jqV"/>
+                        <constraint firstItem="Owf-M8-qJi" firstAttribute="leading" secondItem="Hga-l8-Wua" secondAttribute="trailing" id="GKh-R5-jqV"/>
                         <constraint firstItem="dd4-pE-Es1" firstAttribute="leading" secondItem="a84-Vc-6ud" secondAttribute="leading" constant="13" id="Jem-U2-oEq"/>
                         <constraint firstAttribute="bottom" secondItem="QWp-NV-uh5" secondAttribute="bottom" constant="4" id="NGr-2o-sOP"/>
                         <constraint firstAttribute="trailing" secondItem="3ln-yI-ef9" secondAttribute="trailing" constant="10" id="RXB-PN-3n8"/>
@@ -97,7 +98,6 @@
                         <constraint firstAttribute="bottom" secondItem="Owf-M8-qJi" secondAttribute="bottom" id="Wo7-Qc-PSL"/>
                         <constraint firstItem="QWp-NV-uh5" firstAttribute="top" secondItem="a84-Vc-6ud" secondAttribute="top" constant="4" id="WyZ-3i-OHi"/>
                         <constraint firstAttribute="height" constant="46" id="Yjj-ua-rbe"/>
-                        <constraint firstItem="Hga-l8-Wua" firstAttribute="width" secondItem="Owf-M8-qJi" secondAttribute="width" id="bJo-Xm-0Zt"/>
                         <constraint firstAttribute="trailing" secondItem="QWp-NV-uh5" secondAttribute="trailing" constant="95" id="hXO-cY-Jgz"/>
                         <constraint firstItem="Hga-l8-Wua" firstAttribute="top" secondItem="a84-Vc-6ud" secondAttribute="top" id="pPH-Fp-phr"/>
                         <constraint firstAttribute="trailing" secondItem="Owf-M8-qJi" secondAttribute="trailing" id="vCd-Md-dvr"/>
@@ -131,6 +131,7 @@
                 <outlet property="rightInputToolbarButton" destination="G8Z-CM-tGs" id="NCk-5m-aNF"/>
                 <outlet property="separatorView" destination="3ln-yI-ef9" id="HQ3-B4-Goj"/>
                 <outlet property="voiceCallButton" destination="Owf-M8-qJi" id="krT-w1-mfT"/>
+                <outlet property="voiceCallButtonWidthConstraint" destination="9FZ-CI-diT" id="jYt-Pe-8DY"/>
             </connections>
         </view>
     </objects>