diff --git a/Vector/ViewController/RoomViewController.m b/Vector/ViewController/RoomViewController.m
index 1116354df..2ad8dd182 100644
--- a/Vector/ViewController/RoomViewController.m
+++ b/Vector/ViewController/RoomViewController.m
@@ -126,6 +126,12 @@
         [self.menuListView addConstraint:heightConstraint];
     }
     [self.view setNeedsUpdateConstraints];
+    
+    if (self.roomDataSource)
+    {
+       // this room view controller has its own typing management.
+       self.roomDataSource.showTypingNotifications = NO;
+    }
 }
 
 - (void)didReceiveMemoryWarning
@@ -458,6 +464,8 @@
     // get the room member names
     NSMutableArray *names = [[NSMutableArray alloc] init];
     
+    // keeps the only the first two users
+    // 
     for(int i = 0; i < MIN(count, 2); i++) {
         NSString* name = [currentTypingUsers objectAtIndex:i];
         
@@ -489,7 +497,7 @@
         text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"room_many_users_are_typing", @"Vector", nil), [names objectAtIndex:0], [names objectAtIndex:1]];
     }
     
-    //((RoomInputToolbarView*)self.inputToolbarView).typingNotifLabel.text = text;
+    [((RoomExtraInfosInfoView*) self.extraInfoView) updateTypingMessage:text];
 }
 
 @end
diff --git a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.h b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.h
index d804173be..c015d5fb2 100644
--- a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.h
+++ b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.h
@@ -21,5 +21,14 @@
  `RoomExtraInfosInfoView` instance is a view used to display extra information
  */
 @interface RoomExtraInfosInfoView : MXKRoomExtraInfoView
+
+@property (weak, nonatomic) IBOutlet UIImageView *typingImageView;
+@property (weak, nonatomic) IBOutlet UILabel *messageLabel;
+
 @property (weak, nonatomic) IBOutlet NSLayoutConstraint *mainHeightConstraint;
+
+
+// update the displayed typing message.
+// nil message hides the typing icon too.
+- (void)updateTypingMessage:(NSString*)message;
 @end
diff --git a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.m b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.m
index 244203eb7..33387d15c 100644
--- a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.m
+++ b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.m
@@ -47,5 +47,28 @@
     
     // Remove default toolbar background color
     self.backgroundColor = [UIColor whiteColor];
+    
+    // TODO : put this mint grey color as a resource
+    self.typingImageView.backgroundColor = [UIColor colorWithRed:(98.0/256.0) green:(206.0/256.0) blue:(156.0/256.0) alpha:1.0];
+    self.typingImageView.layer.cornerRadius = self.typingImageView.frame.size.height / 2; 
+    
 }
+
+// update the displayed typing message.
+// nil message hides the typing icon too.
+- (void)updateTypingMessage:(NSString*)message
+{
+    if (message)
+    {
+        self.typingImageView.hidden = false;
+        self.messageLabel.hidden = false;
+        self.messageLabel.text = message;
+    }
+    else
+    {
+        self.typingImageView.hidden = true;
+        self.messageLabel.hidden = true;
+    }
+}
+
 @end
diff --git a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib
index 319bc3c7f..829eae769 100644
--- a/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib
+++ b/Vector/Views/RoomExtraInfosInfoView/RoomExtraInfosInfoView.xib
@@ -2,7 +2,7 @@
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8191"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -13,8 +13,31 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qhJ-5H-64e" userLabel="Container">
                     <rect key="frame" x="0.0" y="0.0" width="600" height="50"/>
-                    <color key="backgroundColor" red="0.75890770890000003" green="1" blue="0.29818001440000003" alpha="1" colorSpace="calibratedRGB"/>
+                    <subviews>
+                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="typing.png" translatesAutoresizingMaskIntoConstraints="NO" id="d6j-oN-9uA">
+                            <rect key="frame" x="8" y="5" width="40" height="40"/>
+                            <color key="backgroundColor" red="1" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="657-fV-gDE"/>
+                                <constraint firstAttribute="width" constant="40" id="vxL-QJ-z0p"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7bS-1u-GUX" userLabel="Message Label">
+                            <rect key="frame" x="56" y="5" width="536" height="40"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="40" id="PVB-be-euJ"/>
+                            </constraints>
+                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                            <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                            <nil key="highlightedColor"/>
+                        </label>
+                    </subviews>
                     <constraints>
+                        <constraint firstItem="7bS-1u-GUX" firstAttribute="leading" secondItem="d6j-oN-9uA" secondAttribute="trailing" constant="8" id="6Js-Lq-pKz"/>
+                        <constraint firstItem="7bS-1u-GUX" firstAttribute="top" secondItem="qhJ-5H-64e" secondAttribute="top" constant="5" id="EYf-ry-ZeK"/>
+                        <constraint firstItem="d6j-oN-9uA" firstAttribute="top" secondItem="qhJ-5H-64e" secondAttribute="top" constant="5" id="MEa-LJ-cGx"/>
+                        <constraint firstItem="d6j-oN-9uA" firstAttribute="leading" secondItem="qhJ-5H-64e" secondAttribute="leading" constant="8" id="YYC-Q1-IoC"/>
+                        <constraint firstAttribute="trailing" secondItem="7bS-1u-GUX" secondAttribute="trailing" constant="8" id="tCW-EI-6Yt"/>
                         <constraint firstAttribute="height" constant="50" id="xPK-Yw-hQ9"/>
                     </constraints>
                 </view>
@@ -31,7 +54,12 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="mainHeightConstraint" destination="xPK-Yw-hQ9" id="dJ5-pI-KyT"/>
+                <outlet property="messageLabel" destination="7bS-1u-GUX" id="5c1-hT-y49"/>
+                <outlet property="typingImageView" destination="d6j-oN-9uA" id="kvp-J3-bVj"/>
             </connections>
         </view>
     </objects>
+    <resources>
+        <image name="typing.png" width="20" height="20"/>
+    </resources>
 </document>