diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
index 4a04c1544..b9d0c3b0b 100644
--- a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
+++ b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -42,6 +42,7 @@
 #import "UIColor+JSQMessages.h"
 #import "UIDevice+JSQMessages.h"
 #import "NSBundle+JSQMessages.h"
+#include <math.h>
 
 
 static void * kJSQMessagesKeyValueObservingContext = &kJSQMessagesKeyValueObservingContext;
@@ -446,19 +447,23 @@ - (void)scrollToBottomAnimated:(BOOL)animated
     //  possibly a UIKit bug, see #480 on GitHub
     NSUInteger finalRow = MAX(0, [self.collectionView numberOfItemsInSection:0] - 1);
     NSIndexPath *finalIndexPath = [NSIndexPath indexPathForItem:finalRow inSection:0];
+    
+    /*
+     *  Chat used to determine whether or not to scroll to the top or bottom based on cell size, but scrolling to "top" was causing messages to show up behind the keyboard
+     *  so now we always scroll to bottom, leaving previous code here for now
+     *
     CGSize finalCellSize = [self.collectionView.collectionViewLayout sizeForItemAtIndexPath:finalIndexPath];
-
     CGFloat maxHeightForVisibleMessage = CGRectGetHeight(self.collectionView.bounds) - self.collectionView.contentInset.top - CGRectGetHeight(self.inputToolbar.bounds);
-
     UICollectionViewScrollPosition scrollPosition = (finalCellSize.height > maxHeightForVisibleMessage) ? UICollectionViewScrollPositionBottom : UICollectionViewScrollPositionTop;
+     */
 
     if (animated) {
         [self.collectionView scrollToItemAtIndexPath:finalIndexPath
-                                    atScrollPosition:scrollPosition
+                                    atScrollPosition:UICollectionViewScrollPositionBottom//scrollPosition
                                             animated:animated];
     }
     else {
-        [self.collectionView setContentOffset:CGPointMake(0, 44+collectionViewContentHeight-(self.collectionView.bounds.size.height))];
+        [self.collectionView setContentOffset:CGPointMake(0, self.bottomLayoutGuide.length+44+collectionViewContentHeight-(self.collectionView.bounds.size.height))];
     }
 }
 
@@ -540,12 +545,18 @@ - (UICollectionViewCell *)collectionView:(JSQMessagesCollectionView *)collection
         if ([messageItem conformsToProtocol:@protocol(JSQMessageAttributedData)])
         {
             id <JSQMessageAttributedData> attributedMessageItem =  (id <JSQMessageAttributedData>) messageItem;
-            cell.textView.attributedText = [attributedMessageItem attributedText];
+            if (![self isPointNaN:cell.textView.layer.position])
+            {
+                cell.textView.attributedText = [attributedMessageItem attributedText];
+            }
         }
         else
         {
-            cell.textView.text = nil;
-            cell.textView.attributedText = [[NSAttributedString alloc] initWithString:[messageItem text] attributes:@{ NSFontAttributeName : collectionView.collectionViewLayout.messageBubbleFont }];
+            if (![self isPointNaN:cell.textView.layer.position])
+            {
+                cell.textView.text = nil;
+                cell.textView.attributedText = [[NSAttributedString alloc] initWithString:([messageItem text] ?: @"") attributes:@{ NSFontAttributeName : collectionView.collectionViewLayout.messageBubbleFont }];
+            }
         }
         NSParameterAssert(cell.textView.text != nil);
 
@@ -915,14 +926,11 @@ - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(N
 
 - (void)keyboardController:(JSQMessagesKeyboardController *)keyboardController keyboardDidChangeFrame:(CGRect)keyboardFrame
 {
-    if (![self.inputToolbar.contentView.textView isFirstResponder] && self.toolbarBottomLayoutGuide.constant == 0.0f) {
-        return;
+    CGFloat heightFromBottom = MAX(0.0f, CGRectGetMaxY(self.collectionView.frame) - CGRectGetMinY(keyboardFrame));
+    if (![self.inputToolbar.contentView.textView isFirstResponder]) {
+        heightFromBottom = 0.0f;
     }
 
-    CGFloat heightFromBottom = CGRectGetMaxY(self.collectionView.frame) - CGRectGetMinY(keyboardFrame);
-
-    heightFromBottom = MAX(0.0f, heightFromBottom);
-
     [self jsq_setToolbarBottomLayoutGuideConstant:heightFromBottom];
 }
 
@@ -1164,4 +1172,9 @@ - (void)jsq_addActionToInteractivePopGestureRecognizer:(BOOL)addAction
     }
 }
 
+-(BOOL)isPointNaN:(CGPoint)point
+{
+    return (isnan(point.x)) || (isnan(point.y));
+}
+
 @end
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib b/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib
index bdf8b03a5..11fa7ca6a 100644
--- a/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib
+++ b/JSQMessagesViewController/Controllers/JSQMessagesViewController.xib
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JSQMessagesViewController">
@@ -19,42 +24,41 @@
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <view contentMode="scaleToFill" id="mUa-cS-ru4">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+            <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Iiw-H7-6Z3">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                 </imageView>
                 <view alpha="0.75" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vkV-Xr-oCa" userLabel="Alpha View">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
-                    <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                 </view>
                 <collectionView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" minimumZoomScale="0.0" maximumZoomScale="0.0" dataMode="none" translatesAutoresizingMaskIntoConstraints="NO" id="l9u-2b-4LK" customClass="JSQMessagesCollectionView">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
-                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                    <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <collectionViewLayout key="collectionViewLayout" id="dZl-7C-LHR" customClass="JSQMessagesCollectionViewFlowLayout"/>
                     <cells/>
                 </collectionView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mha-tV-tTy" customClass="JSQMessagesTopBannerView">
-                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
-                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <rect key="frame" x="0.0" y="44" width="414" height="44"/>
+                    <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="aNj-bg-a4G"/>
                     </constraints>
                     <connections>
                         <outlet property="topBannerViewHeightConstraint" destination="aNj-bg-a4G" id="QRJ-Ow-WOF"/>
-                        <outlet property="topBannerViewTopConstraint" destination="vZM-5c-n3V" id="u0R-G7-ufr"/>
                     </connections>
                 </view>
                 <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BoD-Az-3DM" customClass="JSQMessagesInputToolbar">
-                    <rect key="frame" x="0.0" y="436" width="320" height="44"/>
+                    <rect key="frame" x="0.0" y="818" width="414" height="44"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="HIk-02-qcW"/>
                     </constraints>
                     <items/>
                 </toolbar>
             </subviews>
-            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="Iiw-H7-6Z3" secondAttribute="trailing" id="15M-QN-Kvq"/>
                 <constraint firstItem="vkV-Xr-oCa" firstAttribute="top" secondItem="Iiw-H7-6Z3" secondAttribute="top" id="1TY-0t-DKw"/>
@@ -65,22 +69,19 @@
                 <constraint firstItem="Iiw-H7-6Z3" firstAttribute="top" secondItem="mUa-cS-ru4" secondAttribute="top" id="KZb-7G-4V3"/>
                 <constraint firstItem="l9u-2b-4LK" firstAttribute="leading" secondItem="mUa-cS-ru4" secondAttribute="leading" id="MmF-oh-Y75"/>
                 <constraint firstAttribute="trailing" secondItem="l9u-2b-4LK" secondAttribute="trailing" id="O9u-TA-A0e"/>
+                <constraint firstItem="Mha-tV-tTy" firstAttribute="top" secondItem="rR6-8r-nyl" secondAttribute="top" id="Rc8-zd-ffj"/>
                 <constraint firstAttribute="bottom" secondItem="l9u-2b-4LK" secondAttribute="bottom" id="Re7-WW-UmS"/>
                 <constraint firstAttribute="trailing" secondItem="Mha-tV-tTy" secondAttribute="trailing" id="Wkn-kr-Inm"/>
                 <constraint firstItem="vkV-Xr-oCa" firstAttribute="bottom" secondItem="Iiw-H7-6Z3" secondAttribute="bottom" id="Zt5-QX-KBO"/>
                 <constraint firstItem="Iiw-H7-6Z3" firstAttribute="leading" secondItem="mUa-cS-ru4" secondAttribute="leading" id="adR-JE-yp2"/>
-                <constraint firstAttribute="bottom" secondItem="BoD-Az-3DM" secondAttribute="bottom" id="rHs-6q-NX4"/>
+                <constraint firstItem="BoD-Az-3DM" firstAttribute="bottom" secondItem="rR6-8r-nyl" secondAttribute="bottom" priority="250" id="f9C-gi-Er8"/>
+                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="BoD-Az-3DM" secondAttribute="bottom" id="rHs-6q-NX4"/>
                 <constraint firstItem="BoD-Az-3DM" firstAttribute="leading" secondItem="mUa-cS-ru4" secondAttribute="leading" id="ts7-8f-0lH"/>
                 <constraint firstItem="Mha-tV-tTy" firstAttribute="leading" secondItem="mUa-cS-ru4" secondAttribute="leading" id="uPZ-Rm-oj0"/>
                 <constraint firstItem="vkV-Xr-oCa" firstAttribute="trailing" secondItem="Iiw-H7-6Z3" secondAttribute="trailing" id="uQi-Gp-tOQ"/>
-                <constraint firstItem="Mha-tV-tTy" firstAttribute="top" secondItem="mUa-cS-ru4" secondAttribute="top" id="vZM-5c-n3V"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
+            <viewLayoutGuide key="safeArea" id="rR6-8r-nyl"/>
         </view>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/JSQMessagesViewController/Factories/JSQMessagesMediaViewBubbleImageMasker.m b/JSQMessagesViewController/Factories/JSQMessagesMediaViewBubbleImageMasker.m
index 831804dd8..ed12c698a 100644
--- a/JSQMessagesViewController/Factories/JSQMessagesMediaViewBubbleImageMasker.m
+++ b/JSQMessagesViewController/Factories/JSQMessagesMediaViewBubbleImageMasker.m
@@ -81,10 +81,37 @@ - (void)jsq_maskView:(UIView *)view withImage:(UIImage *)image
     NSParameterAssert(view != nil);
     NSParameterAssert(image != nil);
     
+    /*
     UIImageView *imageViewMask = [[UIImageView alloc] initWithImage:image];
     imageViewMask.frame = CGRectInset(view.frame, 2.0f, 2.0f);
     
     view.layer.mask = imageViewMask.layer;
+    */
+     
+    //the original method of doing this is broken in Xcode 12/iOS 14; masking with UIImageView layers doesn't work anymore
+    //we can get around this by creating the mask layer by hand, but it's a little tricky:
+    
+    //first we need to get a new UIImage with the .orientation property reset to .up
+    //if we use the image as-is we lose the orientation of the UIImage when we grab its GCImage below
+    UIGraphicsBeginImageContextWithOptions(image.size, NO, image.scale);
+    [image drawAtPoint:CGPointMake(0, 0)];
+    UIImage *img = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    //create the layer that will be used as the mask
+    CALayer *layer = [[CALayer alloc] init];
+    layer.contents = (__bridge id _Nullable)(img.CGImage);
+    layer.contentsScale = img.scale;
+    
+    //the following line essentially nine-slices the message bubble shape so that it can be resized
+    layer.contentsCenter = CGRectMake((img.size.width / 2.0f - 1.0f) / img.size.width,
+                                      (img.size.height / 2.0f - 1.0f) / img.size.height,
+                                      1.0f / img.size.width,
+                                      1.0f / img.size.height);
+    
+    layer.frame = CGRectInset(view.frame, 2.0f, 2.0f);
+    
+    view.layer.mask = layer;
 }
 
 @end
diff --git a/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m b/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m
index 595dae6e0..629c980dc 100644
--- a/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m
+++ b/JSQMessagesViewController/Layout/JSQMessagesCollectionViewFlowLayout.m
@@ -313,6 +313,11 @@ - (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect
 {
     NSArray *attributesInRect = [super layoutAttributesForElementsInRect:rect];
     
+    // This function is available in iOS 10. Disable it for dynamic position of `SupplementaryView`
+    if ([self.collectionView respondsToSelector:@selector(setPrefetchingEnabled:)]) {
+        self.collectionView.prefetchingEnabled = false;
+    }
+    
     if (self.springinessEnabled) {
         NSMutableArray *attributesInRectCopy = [attributesInRect mutableCopy];
         NSArray *dynamicAttributes = [self.dynamicAnimator itemsInRect:rect];
@@ -335,14 +340,22 @@ - (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect
         attributesInRect = attributesInRectCopy;
     }
     
-    [attributesInRect enumerateObjectsUsingBlock:^(JSQMessagesCollectionViewLayoutAttributes *attributesItem, NSUInteger idx, BOOL *stop) {
-        if (attributesItem.representedElementCategory == UICollectionElementCategoryCell) {
-            [self jsq_configureMessageCellLayoutAttributes:attributesItem];
-        }
-        else {
-            attributesItem.zIndex = -1;
-        }
-    }];
+    @try
+    {
+        [attributesInRect enumerateObjectsUsingBlock:^(JSQMessagesCollectionViewLayoutAttributes *attributesItem, NSUInteger idx, BOOL *stop) {
+            if (attributesItem.representedElementCategory == UICollectionElementCategoryCell) {
+                [self jsq_configureMessageCellLayoutAttributes:attributesItem];
+            }
+            else {
+                attributesItem.zIndex = -1;
+            }
+        }];
+    }
+    @catch (NSException *exception)
+    {
+        NSLog(@"JSQMessagesCollectionViewFlowLayout:: failed to layout elements in rect %@: %@",
+              NSStringFromCGRect(rect), exception.description);
+    }
     
     return attributesInRect;
 }
diff --git a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib
index f69b5404d..1b14cd607 100644
--- a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib
+++ b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellIncoming.xib
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -16,7 +18,7 @@
                 <subviews>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cell top label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="afj-rd-iNv" userLabel="Cell top label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="20"/>
-                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="fKS-MR-YPI"/>
                         </constraints>
@@ -26,7 +28,7 @@
                     </label>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="bubble top label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ufa-bF-l1Y" userLabel="Bubble top label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="0.0" y="20" width="320" height="20"/>
-                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="fal-sy-hrK"/>
                         </constraints>
@@ -47,7 +49,7 @@
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="trailing" secondItem="KYU-B8-cUW" secondAttribute="trailing" id="4qS-03-PFO"/>
                             <constraint firstAttribute="bottom" secondItem="KYU-B8-cUW" secondAttribute="bottom" id="B2v-Gq-Y1L"/>
@@ -67,7 +69,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="34" height="34"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="w23-sL-0Rh" firstAttribute="leading" secondItem="Da1-09-wR4" secondAttribute="leading" id="6zm-sH-cOT"/>
                             <constraint firstAttribute="trailing" secondItem="w23-sL-0Rh" secondAttribute="trailing" id="JgK-7W-L10"/>
@@ -79,7 +81,7 @@
                     </view>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cell bottom label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UPz-5x-c1T" userLabel="Cell bottom label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="36" y="134" width="108" height="20"/>
-                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="xPR-Ph-Ze9"/>
                         </constraints>
@@ -125,12 +127,7 @@
                 <outlet property="textViewMarginHorizontalSpaceConstraint" destination="4qS-03-PFO" id="1Qe-Ee-fUO"/>
                 <outlet property="textViewTopVerticalSpaceConstraint" destination="aEL-yH-N1p" id="WPl-0b-tf1"/>
             </connections>
-            <point key="canvasLocation" x="255" y="202"/>
+            <point key="canvasLocation" x="369.56521739130437" y="135.26785714285714"/>
         </collectionViewCell>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib
index 2bfdb2044..2952f0b0b 100644
--- a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib
+++ b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCellOutgoing.xib
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="10117" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14865.1" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14819.2"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -16,7 +18,7 @@
                 <subviews>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cell top label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jxM-YD-sVG" userLabel="Cell top label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="20"/>
-                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="9oK-E7-iXA"/>
                         </constraints>
@@ -26,7 +28,7 @@
                     </label>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="bubble top label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p52-YN-yLu" userLabel="Bubble top label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="0.0" y="20" width="320" height="20"/>
-                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="8TB-va-f8L"/>
                         </constraints>
@@ -47,7 +49,7 @@
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
                         </subviews>
-                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstItem="vLY-aM-0Dr" firstAttribute="leading" secondItem="2zh-vR-QJW" secondAttribute="leading" id="7rI-Nc-AK3"/>
                             <constraint firstAttribute="trailing" secondItem="2qm-c6-OZf" secondAttribute="trailing" id="AEu-1l-tqh"/>
@@ -67,7 +69,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="34" height="34"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="bottom" secondItem="y9b-D9-Q7W" secondAttribute="bottom" id="7SX-4t-GAr"/>
                             <constraint firstAttribute="width" constant="34" id="Pkm-tW-k4z"/>
@@ -79,7 +81,7 @@
                     </view>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="cell bottom label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7Uc-dI-YDD" userLabel="Cell bottom label" customClass="JSQMessagesLabel">
                         <rect key="frame" x="176" y="134" width="108" height="20"/>
-                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="calibratedRGB"/>
+                        <color key="backgroundColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="20" id="cPs-M4-tjX"/>
                         </constraints>
@@ -125,12 +127,7 @@
                 <outlet property="textViewMarginHorizontalSpaceConstraint" destination="7rI-Nc-AK3" id="ciu-j6-IpH"/>
                 <outlet property="textViewTopVerticalSpaceConstraint" destination="RiG-21-Bqc" id="i3j-z0-feE"/>
             </connections>
-            <point key="canvasLocation" x="371" y="145"/>
+            <point key="canvasLocation" x="537.68115942028987" y="97.098214285714278"/>
         </collectionViewCell>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
 </document>
diff --git a/JSQMessagesViewController/Views/JSQMessagesComposerTextView.m b/JSQMessagesViewController/Views/JSQMessagesComposerTextView.m
index e46c95992..d22995252 100644
--- a/JSQMessagesViewController/Views/JSQMessagesComposerTextView.m
+++ b/JSQMessagesViewController/Views/JSQMessagesComposerTextView.m
@@ -73,7 +73,6 @@ - (void)jsq_configureTextView
     self.keyboardAppearance = UIKeyboardAppearanceDefault;
     self.keyboardType = UIKeyboardTypeDefault;
     self.returnKeyType = UIReturnKeyDefault;
-    self.allowsEditingTextAttributes = YES;
     
     self.text = nil;
     self.attributedText = nil;
@@ -164,31 +163,7 @@ - (void)setTextAlignment:(NSTextAlignment)textAlignment
 - (void)paste:(id)sender
 {
     if (!self.pasteDelegate || [self.pasteDelegate composerTextView:self shouldPasteWithSender:sender]) {
-        if (!shouldPasteRTF) {
-            [self setText:[UIPasteboard generalPasteboard].string];
-            [self.pasteDelegate composerTextView:self didPasteWithSender:sender];
-            return;
-        }
-        UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
-        NSData* data = nil;
-        NSMutableArray *types = [[NSMutableArray alloc]init];
-        for (NSDictionary* item in pasteboard.items) {
-            for (NSString* type in item.allKeys)
-                [types addObject:type];
-        }
-        if ([types containsObject:@"com.apple.flat-rtfd"])
-        {
-            for (NSDictionary* item in pasteboard.items) {
-                if (item[@"com.apple.flat-rtfd"]) {
-                    data = item[@"com.apple.flat-rtfd"];
-                    NSDictionary *options = @{NSDocumentTypeDocumentAttribute: NSRTFDTextDocumentType};
-                    [self setAttributedText: [[NSMutableAttributedString alloc]initWithData:data options:options documentAttributes:nil error:nil]];
-                    break;
-                }
-            }
-        }
-        else [super paste:sender];
-        [self.pasteDelegate composerTextView:self didPasteWithSender:sender];
+        [super paste:sender];
     }
 }
 
diff --git a/JSQMessagesViewController/Views/JSQMessagesTopBannerView.h b/JSQMessagesViewController/Views/JSQMessagesTopBannerView.h
index a197c382b..c3dbd4f52 100644
--- a/JSQMessagesViewController/Views/JSQMessagesTopBannerView.h
+++ b/JSQMessagesViewController/Views/JSQMessagesTopBannerView.h
@@ -2,8 +2,8 @@
 //  JSQMessagesTopBannerView.h
 //  Dollarama
 //
-//  Created by besat@morgiij.com on 2017-03-10.
-//  Copyright © 2017 binnj. All rights reserved.
+//  Created by binnj, inc. on 2017-03-10.
+//  Copyright © 2017 binnj, inc. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>
diff --git a/JSQMessagesViewController/Views/JSQMessagesTopBannerView.m b/JSQMessagesViewController/Views/JSQMessagesTopBannerView.m
index d5969ec7d..37849dd4e 100644
--- a/JSQMessagesViewController/Views/JSQMessagesTopBannerView.m
+++ b/JSQMessagesViewController/Views/JSQMessagesTopBannerView.m
@@ -2,8 +2,8 @@
 //  JSQMessagesTopBannerView.m
 //  Dollarama
 //
-//  Created by besat@morgiij.com on 2017-03-10.
-//  Copyright © 2017 binnj. All rights reserved.
+//  Created by binnj, inc. on 2017-03-10.
+//  Copyright © 2017 binnj, inc. All rights reserved.
 //
 
 #import "JSQMessagesTopBannerView.h"