diff --git a/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift b/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift
new file mode 100644
index 000000000000..8a0f982ca63d
--- /dev/null
+++ b/WordPress/Classes/Extensions/NSAttributedString+Helpers.swift
@@ -0,0 +1,44 @@
+import Foundation
+
+
+extension NSAttributedString
+{
+    /**
+        Note:
+        This method will embed a collection of assets, in the specified NSRange's. Since NSRange is an ObjC struct,
+        you'll need to wrap it up into a NSValue instance!
+    */
+    public func stringByEmbeddingImageAttachments(embeds: [NSValue: UIImage]?) -> NSAttributedString {
+        // Allow nil embeds: behave as a simple NO-OP
+        if embeds == nil {
+            return self
+        }
+        
+        // Proceed embedding!
+        let unwrappedEmbeds = embeds!
+        let theString       = self.mutableCopy() as NSMutableAttributedString
+        var rangeDelta      = 0
+        
+        for (value, image) in unwrappedEmbeds {
+            let imageAttachment     = NSTextAttachment()
+            imageAttachment.bounds  = CGRect(origin: CGPointZero, size: image.size)
+            imageAttachment.image   = image
+            
+            // Each embed is expected to add 1 char to the string. Compensate for that
+            let attachmentString    = NSAttributedString(attachment: imageAttachment)
+            var correctedRange      = value.rangeValue
+            correctedRange.location += rangeDelta
+            
+            // Bounds Safety
+            let lastPosition        = correctedRange.location + correctedRange.length
+            if lastPosition <= theString.length {
+                theString.replaceCharactersInRange(correctedRange, withAttributedString: attachmentString)
+            }
+            
+            rangeDelta += attachmentString.length
+
+        }
+        
+        return theString
+    }
+}
diff --git a/WordPress/Classes/Extensions/NSParagraphStyle+Helpers.swift b/WordPress/Classes/Extensions/NSParagraphStyle+Helpers.swift
index f9c2fd419cb1..efccda6515d4 100644
--- a/WordPress/Classes/Extensions/NSParagraphStyle+Helpers.swift
+++ b/WordPress/Classes/Extensions/NSParagraphStyle+Helpers.swift
@@ -3,11 +3,15 @@ import Foundation
 
 extension NSMutableParagraphStyle
 {
-    convenience init(minLineHeight: CGFloat, maxLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
+    convenience init(minLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
         self.init()
         self.minimumLineHeight  = minLineHeight
-        self.maximumLineHeight  = maxLineHeight
         self.lineBreakMode      = lineBreakMode
         self.alignment          = alignment
     }
+    
+    convenience init(minLineHeight: CGFloat, maxLineHeight: CGFloat, lineBreakMode: NSLineBreakMode, alignment: NSTextAlignment) {
+        self.init(minLineHeight: minLineHeight, lineBreakMode: lineBreakMode, alignment: alignment)
+        self.maximumLineHeight  = maxLineHeight
+    }
 }
diff --git a/WordPress/Classes/Extensions/Notifications/NotificationBlock+Interface.swift b/WordPress/Classes/Extensions/Notifications/NotificationBlock+Interface.swift
index b77cc7e00026..6302939436b0 100644
--- a/WordPress/Classes/Extensions/Notifications/NotificationBlock+Interface.swift
+++ b/WordPress/Classes/Extensions/Notifications/NotificationBlock+Interface.swift
@@ -4,30 +4,7 @@ import Foundation
 extension NotificationBlock
 {
     public func subjectAttributedText() -> NSAttributedString {
-        if text == nil {
-            return NSAttributedString()
-        }
-        
-        let theString = NSMutableAttributedString(string: text, attributes: WPStyleGuide.Notifications.subjectRegularStyle)
-
-        theString.applyAttributesToQuotes(WPStyleGuide.Notifications.subjectItalicsStyle)
-
-        for notificationRange in ranges as [NotificationRange] {
-            
-            // Make sure this range is not of bounds!
-            let range = notificationRange.range
-            if range.location + range.length > theString.length {
-                continue
-            }
-            
-            if notificationRange.isUser {
-                theString.addAttributes(WPStyleGuide.Notifications.subjectBoldStyle, range: range)
-            } else if notificationRange.isPost || notificationRange.isComment {
-                theString.addAttributes(WPStyleGuide.Notifications.subjectItalicsStyle, range: range)
-            }
-        }
-
-        return theString;
+        return textWithRangeStyles(isSubject: true)
     }
 
     public func snippetAttributedText() -> NSAttributedString {
@@ -35,40 +12,77 @@ extension NotificationBlock
             return NSAttributedString()
         }
 
-        return NSMutableAttributedString(string: text, attributes: WPStyleGuide.Notifications.snippetRegularStyle)
+        return NSAttributedString(string: text, attributes: Styles.snippetRegularStyle)
     }
 
-    public func regularAttributedText() -> NSAttributedString {
+    public func richAttributedText() -> NSAttributedString {
+        //  Operations such as editing a comment cause a lag between the REST and Simperium update.
+        //  TextOverride is a transient property meant to store, temporarily, the edited text
+        if textOverride != nil {
+            return NSAttributedString(string: textOverride, attributes: Styles.blockRegularStyle)
+        }
+        
+        return textWithRangeStyles(isSubject: false)
+    }
+    
+    public func buildRangesToImagesMap(mediaMap: [NSURL: UIImage]?) -> [NSValue: UIImage]? {
+        // If we've got a text override: Ranges may not match, and the new text may not even contain ranges!
+        if mediaMap == nil || textOverride != nil {
+            return nil
+        }
+        
+        var ranges = [NSValue: UIImage]()
+        
+        for theMedia in media as [NotificationMedia] {
+            if let image = mediaMap![theMedia.mediaURL] {
+                let rangeValue      = NSValue(range: theMedia.range)
+                ranges[rangeValue]  = image
+            }
+        }
+        
+        return ranges
+    }
+    
+    
+    // MARK: - Private Helpers
+    private func textWithRangeStyles(#isSubject: Bool) -> NSAttributedString {
         if text == nil {
             return NSAttributedString()
         }
         
-        let theString = NSMutableAttributedString(string: text, attributes: WPStyleGuide.Notifications.blockRegularStyle)
+        // Setup the styles
+        let regularStyle    = isSubject ? Styles.subjectRegularStyle : (isBadge ? Styles.blockBadgeStyle : Styles.blockRegularStyle)
+        let quotesStyle     = isSubject ? Styles.subjectItalicsStyle : Styles.blockBoldStyle
+        let userStyle       = isSubject ? Styles.subjectBoldStyle    : Styles.blockBoldStyle
+        let postStyle       = isSubject ? Styles.subjectItalicsStyle : Styles.blockItalicsStyle
+        let commentStyle    = postStyle
+        let blockStyle      = Styles.blockQuotedStyle
         
-        theString.applyAttributesToQuotes(WPStyleGuide.Notifications.blockBoldStyle)
+        // Format the String
+        let theString = NSMutableAttributedString(string: text, attributes: regularStyle)
+        theString.applyAttributesToQuotes(quotesStyle)
         
         for range in ranges as [NotificationRange] {
-            if range.isPost {
-                theString.addAttributes(WPStyleGuide.Notifications.blockItalicsStyle, range: range.range)
+            if range.isUser {
+                theString.addAttributes(userStyle, range: range.range)
+            } else if range.isPost {
+                theString.addAttributes(postStyle, range: range.range)
+            } else if range.isComment {
+                theString.addAttributes(commentStyle, range: range.range)
             } else if range.isBlockquote {
-                theString.addAttributes(WPStyleGuide.Notifications.blockQuotedStyle, range: range.range)
+                theString.addAttributes(blockStyle, range: range.range)
             }
 
-            if range.url != nil {
+            // Don't Highlight Links in the subject
+            if isSubject == false && range.url != nil {
                 theString.addAttribute(NSLinkAttributeName, value: range.url, range: range.range)
-                theString.addAttribute(NSForegroundColorAttributeName, value: WPStyleGuide.Notifications.blockLinkColor, range: range.range)
+                theString.addAttribute(NSForegroundColorAttributeName, value: Styles.blockLinkColor, range: range.range)
             }
         }
 
         return theString
     }
-
-    public func regularAttributedTextOverride() -> NSAttributedString? {
-        //  Operations such as editing a comment cause a lag between the REST and Simperium update.
-        //  TextOverride is a transient property meant to store, temporarily, the edited text
-        if textOverride != nil {
-            return NSAttributedString(string: textOverride, attributes: WPStyleGuide.Notifications.blockRegularStyle)
-        }
-        return nil
-    }
+    
+    private typealias Styles = WPStyleGuide.Notifications
 }
+
diff --git a/WordPress/Classes/Models/Notifications/Notification.h b/WordPress/Classes/Models/Notifications/Notification.h
index 47bc7b9a9ca8..52f0f0cd7d27 100644
--- a/WordPress/Classes/Models/Notifications/Notification.h
+++ b/WordPress/Classes/Models/Notifications/Notification.h
@@ -19,10 +19,12 @@ extern NSString * NoteActionReplyKey;
 extern NSString * NoteActionApproveKey;
 extern NSString * NoteActionEditKey;
 
+extern NSString * NoteMediaTypeImage;
+
 typedef NS_ENUM(NSInteger, NoteBlockType)
 {
     NoteBlockTypeText,
-    NoteBlockTypeImage,                                    // BlockTypesImage: Includes Badges and Images
+    NoteBlockTypeImage,                                     // BlockTypesImage: Includes Badges and Images
     NoteBlockTypeUser,
     NoteBlockTypeComment
 };
@@ -32,9 +34,9 @@ typedef NS_ENUM(NSInteger, NoteBlockGroupType)
     NoteBlockGroupTypeText     = NoteBlockTypeText,
     NoteBlockGroupTypeImage    = NoteBlockTypeImage,
     NoteBlockGroupTypeUser     = NoteBlockTypeUser,
-    NoteBlockGroupTypeComment  = NoteBlockTypeComment,    // Contains a User + Comment Block
-    NoteBlockGroupTypeSubject  = 20,                       // Contains a User + Text Block
-    NoteBlockGroupTypeHeader   = 30                        // Contains a User + Text Block
+    NoteBlockGroupTypeComment  = NoteBlockTypeComment,      // Contains a User + Comment Block
+    NoteBlockGroupTypeSubject  = 20,                        // Contains a User + Text Block
+    NoteBlockGroupTypeHeader   = 30                         // Contains a User + Text Block
 };
 
 
@@ -94,6 +96,7 @@ typedef NS_ENUM(NSInteger, NoteBlockGroupType)
 @property (nonatomic, assign, readonly) NoteBlockGroupType type;
 
 - (NotificationBlock *)blockOfType:(NoteBlockType)type;
+- (NSSet *)imageUrlsForBlocksOfTypes:(NSSet *)types;
 
 @end
 
@@ -111,17 +114,18 @@ typedef NS_ENUM(NSInteger, NoteBlockGroupType)
 @property (nonatomic, strong, readonly) NSDictionary        *actions;
 
 // Derived Properties
-@property (nonatomic, assign, readonly) NoteBlockType      type;
+@property (nonatomic, assign, readonly) NoteBlockType       type;
+@property (nonatomic, assign, readonly) BOOL                isBadge;
 @property (nonatomic, strong, readonly) NSNumber            *metaSiteID;
 @property (nonatomic, strong, readonly) NSNumber            *metaCommentID;
 @property (nonatomic, strong, readonly) NSString            *metaLinksHome;
 @property (nonatomic, strong, readonly) NSString            *metaTitlesHome;
-@property (nonatomic, strong, readonly) NSString            *metaTitleOrUrl;
 
 // Overrides
 @property (nonatomic, strong, readwrite) NSString           *textOverride;
 
 - (NotificationRange *)notificationRangeWithUrl:(NSURL *)url;
+- (NSArray *)imageUrls;
 
 - (void)setActionOverrideValue:(NSNumber *)obj forKey:(NSString *)key;
 - (void)removeActionOverrideForKey:(NSString *)key;
diff --git a/WordPress/Classes/Models/Notifications/Notification.m b/WordPress/Classes/Models/Notifications/Notification.m
index ca70f515bbad..10d8052f6ef5 100644
--- a/WordPress/Classes/Models/Notifications/Notification.m
+++ b/WordPress/Classes/Models/Notifications/Notification.m
@@ -201,7 +201,8 @@ + (NSArray *)mediaFromArray:(NSArray *)rawMedia
 
 @interface NotificationBlock ()
 @property (nonatomic, strong, readwrite) NSMutableDictionary    *actionsOverride;
-@property (nonatomic, assign, readwrite) NoteBlockType         type;
+@property (nonatomic, assign, readwrite) NoteBlockType          type;
+@property (nonatomic, assign, readwrite) BOOL                   isBadge;
 @end
 
 
@@ -245,15 +246,6 @@ - (NSString *)metaTitlesHome
     return [[self.meta dictionaryForKey:NoteTitlesKey] stringForKey:NoteHomeKey];
 }
 
-- (NSString *)metaTitleOrUrl
-{
-    if ([self metaTitlesHome]) {
-        return [self metaTitlesHome];
-    }
-    
-    return self.metaLinksHome.hostname;
-}
-
 - (NotificationRange *)notificationRangeWithUrl:(NSURL *)url
 {
     for (NotificationRange *range in self.ranges) {
@@ -265,6 +257,19 @@ - (NotificationRange *)notificationRangeWithUrl:(NSURL *)url
     return nil;
 }
 
+- (NSArray *)imageUrls
+{
+    NSMutableArray *urls = [NSMutableArray array];
+    
+    for (NotificationMedia *media in self.media) {
+        if (media.isImage && media.mediaURL != nil) {
+            [urls addObject:media.mediaURL];
+        }
+    }
+    
+    return urls;
+}
+
 - (void)setActionOverrideValue:(NSNumber *)value forKey:(NSString *)key
 {
     if (!_actionsOverride) {
@@ -301,6 +306,7 @@ + (NSArray *)blocksFromArray:(NSArray *)rawBlocks notification:(Notification *)n
     }
     
     NSMutableArray *parsed  = [NSMutableArray array];
+    BOOL isBadge = false;
     
     for (NSDictionary *rawDict in rawBlocks) {
         if (![rawDict isKindOfClass:[NSDictionary class]]) {
@@ -330,11 +336,24 @@ + (NSArray *)blocksFromArray:(NSArray *)rawBlocks notification:(Notification *)n
         } else {
             block.type = NoteBlockTypeText;
         }
-        
+
+        // Figure out if this is a badge
+        for (NotificationMedia *media in block.media) {
+            if (media.isBadge) {
+                isBadge = true;
+            }
+        }
         
         [parsed addObject:block];
     }
     
+    // Note: Seriously. Duck typing should be abolished.
+    if (isBadge) {
+        for (NotificationBlock *block in parsed) {
+            block.isBadge = true;
+        }
+    }
+    
     return parsed;
 }
 
@@ -346,8 +365,8 @@ + (NSArray *)blocksFromArray:(NSArray *)rawBlocks notification:(Notification *)n
 #pragma mark ====================================================================================
 
 @interface NotificationBlockGroup ()
-@property (nonatomic, strong) NSArray             *blocks;
-@property (nonatomic, assign) NoteBlockGroupType type;
+@property (nonatomic, strong) NSArray               *blocks;
+@property (nonatomic, assign) NoteBlockGroupType    type;
 @end
 
 @implementation NotificationBlockGroup
@@ -362,6 +381,24 @@ - (NotificationBlock *)blockOfType:(NoteBlockType)type
     return nil;
 }
 
+- (NSSet *)imageUrlsForBlocksOfTypes:(NSSet *)types
+{
+    NSMutableSet *urls = [NSMutableSet set];
+    
+    for (NotificationBlock *block in self.blocks) {
+        if ([types containsObject:@(block.type)] == false) {
+            continue;
+        }
+        
+        NSArray *imageUrls = [block imageUrls];
+        if (imageUrls) {
+            [urls addObjectsFromArray:imageUrls];
+        }
+    }
+    
+    return urls;
+}
+
 + (NotificationBlockGroup *)groupWithBlocks:(NSArray *)blocks type:(NoteBlockGroupType)type
 {
     NotificationBlockGroup *group   = [self new];
@@ -549,10 +586,8 @@ - (BOOL)isBadge
     //
     for (NotificationBlockGroup *group in self.bodyBlockGroups) {
         for (NotificationBlock *block in group.blocks) {
-            for (NotificationMedia *media in block.media) {
-                if (media.isBadge) {
-                    return true;
-                }
+            if (block.isBadge) {
+                return true;
             }
         }
     }
diff --git a/WordPress/Classes/System/WordPress-Bridging-Header.h b/WordPress/Classes/System/WordPress-Bridging-Header.h
index 6a9d22829540..f328e492a4fb 100644
--- a/WordPress/Classes/System/WordPress-Bridging-Header.h
+++ b/WordPress/Classes/System/WordPress-Bridging-Header.h
@@ -1,5 +1,8 @@
+#import <AFNetworking/AFNetworking.h>
 #import <AFNetworking/UIKit+AFNetworking.h>
 
+#import <MGImageUtilities/UIImage+ProportionalFill.h>
+
 #import "Notification.h"
 
 #import "DDLogSwift.h"
diff --git a/WordPress/Classes/Utility/WPDynamicHeightTextView.swift b/WordPress/Classes/Utility/WPDynamicHeightTextView.swift
deleted file mode 100644
index 6f17a362118a..000000000000
--- a/WordPress/Classes/Utility/WPDynamicHeightTextView.swift
+++ /dev/null
@@ -1,22 +0,0 @@
-import Foundation
-
-
-public class WPDynamicHeightTextView : UITextView
-{
-    public var preferredMaxLayoutWidth: CGFloat = 0 {
-        didSet {
-            invalidateIntrinsicContentSize()
-        }
-    }
-    
-    public override func intrinsicContentSize() -> CGSize {
-        // Fix: Let's add 1pt extra size. There are few scenarios in which text gets clipped by 1 point
-        let bottomPadding: CGFloat = 1
-        let maxWidth = (preferredMaxLayoutWidth != 0) ? preferredMaxLayoutWidth : frame.width
-        let maxSize = CGSize(width: maxWidth, height: CGFloat.max)
-        let requiredSize = sizeThatFits(maxSize)
-        let roundedSize = CGSize(width: ceil(requiredSize.width), height: ceil(requiredSize.height) + bottomPadding)
-        
-        return roundedSize
-    }
-}
diff --git a/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.swift b/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.swift
index 6fe2cb3e36c2..c44619e4fb54 100644
--- a/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.swift
@@ -17,7 +17,8 @@ import Foundation
                 return
             }
 
-            super.attributedCommentText = NSMutableAttributedString(string: commentText!, attributes: WPStyleGuide.Notifications.blockRegularStyle)
+            let style = WPStyleGuide.Notifications.blockRegularStyle
+            super.attributedCommentText = NSMutableAttributedString(string: commentText!, attributes: style)
         }
     }
 }
diff --git a/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.xib b/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.xib
index 0e9829739b48..4aa9a6639e64 100644
--- a/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.xib
+++ b/WordPress/Classes/ViewRelated/Comments/CommentTableViewCell.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14B17" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -41,7 +40,7 @@
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ody-C4-D1J">
-                        <rect key="frame" x="54" y="8" width="188" height="15"/>
+                        <rect key="frame" x="54" y="8" width="188" height="14.5"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="188" id="iZi-gw-OC5"/>
                         </constraints>
@@ -50,23 +49,18 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" text="Timestamp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rpo-Dh-mzR">
-                        <rect key="frame" x="54" y="24" width="62" height="15"/>
+                        <rect key="frame" x="54" y="23" width="62" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" verticalHuggingPriority="248" horizontalCompressionResistancePriority="748" verticalCompressionResistancePriority="748" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FIY-8e-Xb5">
-                        <rect key="frame" x="116" y="18" width="192" height="27"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" misplaced="YES" text="Site" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nYH-7M-K2c" userLabel="Site">
+                        <rect key="frame" x="116" y="23" width="62" height="14.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                        <state key="normal" title="Site Url">
-                            <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                            <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                        </state>
-                        <connections>
-                            <action selector="siteWasPressed:" destination="aIj-oS-YdB" eventType="touchUpInside" id="9WJ-IJ-BCo"/>
-                        </connections>
-                    </button>
-                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="czw-Zv-DEQ" customClass="WPDynamicHeightTextView" customModule="WordPress" customModuleProvider="target">
+                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="czw-Zv-DEQ" customClass="RichTextView" customModule="WordPress">
                         <rect key="frame" x="12" y="49" width="296" height="18"/>
                         <color key="backgroundColor" red="0.9215686917" green="0.93333339689999995" blue="0.94901967050000002" alpha="1" colorSpace="deviceRGB"/>
                         <constraints>
@@ -162,18 +156,19 @@
                     <constraint firstItem="avk-i4-k8j" firstAttribute="height" secondItem="xRU-mN-25Z" secondAttribute="height" id="2r3-xl-aMf"/>
                     <constraint firstItem="Cm4-L9-Oo6" firstAttribute="leading" secondItem="dlQ-nz-Av7" secondAttribute="trailing" constant="20" id="35K-yG-BLY"/>
                     <constraint firstItem="czw-Zv-DEQ" firstAttribute="top" secondItem="7M2-1g-ohj" secondAttribute="bottom" constant="5" id="6L3-4h-sEh"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="nYH-7M-K2c" secondAttribute="trailing" constant="12" id="ApB-VY-yfq"/>
                     <constraint firstItem="Ody-C4-D1J" firstAttribute="leading" secondItem="7M2-1g-ohj" secondAttribute="trailing" constant="10" id="BJg-uc-5za"/>
                     <constraint firstAttribute="trailing" secondItem="xRU-mN-25Z" secondAttribute="trailing" constant="20" id="DTE-ry-TnY"/>
                     <constraint firstItem="dlQ-nz-Av7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="dPV-zh-vNn" secondAttribute="leading" constant="20" id="F2h-RM-lpA"/>
                     <constraint firstItem="avk-i4-k8j" firstAttribute="leading" secondItem="Cm4-L9-Oo6" secondAttribute="trailing" constant="20" id="F3q-Vm-el9"/>
                     <constraint firstItem="7M2-1g-ohj" firstAttribute="leading" secondItem="dPV-zh-vNn" secondAttribute="leading" constant="12" id="Fvr-Zv-scV"/>
-                    <constraint firstItem="rpo-Dh-mzR" firstAttribute="centerY" secondItem="FIY-8e-Xb5" secondAttribute="centerY" id="GXp-zR-upD"/>
                     <constraint firstItem="czw-Zv-DEQ" firstAttribute="leading" secondItem="dPV-zh-vNn" secondAttribute="leading" constant="12" id="ITB-hK-uZ7"/>
-                    <constraint firstAttribute="trailingMargin" secondItem="FIY-8e-Xb5" secondAttribute="trailing" constant="4" id="Iob-A8-4UO"/>
                     <constraint firstItem="vGn-vV-Bwg" firstAttribute="height" secondItem="xRU-mN-25Z" secondAttribute="height" id="JkU-Hk-gB2"/>
                     <constraint firstItem="xed-nb-SpT" firstAttribute="top" secondItem="IJ6-A7-qby" secondAttribute="bottom" id="MPg-1L-Qee"/>
                     <constraint firstAttribute="trailing" secondItem="czw-Zv-DEQ" secondAttribute="trailing" constant="12" id="PUE-va-lfD"/>
+                    <constraint firstItem="nYH-7M-K2c" firstAttribute="leading" secondItem="rpo-Dh-mzR" secondAttribute="trailing" id="QIW-Mt-4a3"/>
                     <constraint firstItem="xRU-mN-25Z" firstAttribute="height" secondItem="Cm4-L9-Oo6" secondAttribute="height" id="RBs-Ll-bJ5"/>
+                    <constraint firstItem="nYH-7M-K2c" firstAttribute="top" secondItem="rpo-Dh-mzR" secondAttribute="top" id="Vrn-SI-Un8"/>
                     <constraint firstItem="xRU-mN-25Z" firstAttribute="leading" secondItem="vGn-vV-Bwg" secondAttribute="trailing" constant="20" id="Xg9-21-TDA"/>
                     <constraint firstItem="7M2-1g-ohj" firstAttribute="top" secondItem="dPV-zh-vNn" secondAttribute="top" constant="12" id="YOd-iG-utX"/>
                     <constraint firstItem="xed-nb-SpT" firstAttribute="top" secondItem="czw-Zv-DEQ" secondAttribute="bottom" constant="8" id="Z1X-H7-Urj"/>
@@ -181,11 +176,11 @@
                     <constraint firstItem="7M2-1g-ohj" firstAttribute="top" secondItem="Ody-C4-D1J" secondAttribute="top" constant="4" id="c1K-Qk-qys"/>
                     <constraint firstItem="vGn-vV-Bwg" firstAttribute="leading" secondItem="avk-i4-k8j" secondAttribute="trailing" constant="20" id="fnl-XD-orS"/>
                     <constraint firstItem="IJ6-A7-qby" firstAttribute="top" secondItem="dPV-zh-vNn" secondAttribute="top" id="gGO-sk-tMK"/>
-                    <constraint firstItem="FIY-8e-Xb5" firstAttribute="leading" secondItem="rpo-Dh-mzR" secondAttribute="trailing" id="gTz-OU-Csx"/>
                     <constraint firstItem="vGn-vV-Bwg" firstAttribute="bottom" secondItem="xRU-mN-25Z" secondAttribute="bottom" id="has-Oz-efz"/>
                     <constraint firstItem="IJ6-A7-qby" firstAttribute="leading" secondItem="dPV-zh-vNn" secondAttribute="leading" id="iKK-LL-ZVP"/>
                     <constraint firstItem="xRU-mN-25Z" firstAttribute="bottom" secondItem="Cm4-L9-Oo6" secondAttribute="bottom" id="jB8-yG-JDP"/>
                     <constraint firstItem="xRU-mN-25Z" firstAttribute="height" secondItem="dlQ-nz-Av7" secondAttribute="height" id="jy3-Hu-5sx"/>
+                    <constraint firstItem="nYH-7M-K2c" firstAttribute="bottom" secondItem="rpo-Dh-mzR" secondAttribute="bottom" id="kj7-BL-KUg"/>
                     <constraint firstItem="xRU-mN-25Z" firstAttribute="top" secondItem="czw-Zv-DEQ" secondAttribute="bottom" constant="20" id="lv1-kc-xo2"/>
                     <constraint firstItem="rpo-Dh-mzR" firstAttribute="top" secondItem="Ody-C4-D1J" secondAttribute="bottom" constant="1" id="mAc-fl-PMC"/>
                     <constraint firstItem="xed-nb-SpT" firstAttribute="leading" secondItem="czw-Zv-DEQ" secondAttribute="leading" id="nrM-fx-sLR"/>
@@ -208,11 +203,11 @@
                 <outlet property="btnLike" destination="Cm4-L9-Oo6" id="ZgO-t8-o3C"/>
                 <outlet property="btnMore" destination="xRU-mN-25Z" id="ev5-Ol-AnS"/>
                 <outlet property="btnReply" destination="dlQ-nz-Av7" id="ToF-iR-Btp"/>
-                <outlet property="btnSite" destination="FIY-8e-Xb5" id="6OZ-hM-9bd"/>
                 <outlet property="btnTrash" destination="vGn-vV-Bwg" id="8Fv-ce-ZWn"/>
                 <outlet property="gravatarImageView" destination="7M2-1g-ohj" id="52l-ke-wW4"/>
                 <outlet property="nameLabel" destination="Ody-C4-D1J" id="EiQ-4i-e33"/>
                 <outlet property="separatorView" destination="xed-nb-SpT" id="373-VS-DFM"/>
+                <outlet property="siteLabel" destination="nYH-7M-K2c" id="M4C-6C-jn2"/>
                 <outlet property="textView" destination="czw-Zv-DEQ" id="Vco-Va-E6F"/>
                 <outlet property="timestampLabel" destination="rpo-Dh-mzR" id="Zpo-AZ-Bkj"/>
             </connections>
diff --git a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m
index 8817f1610db9..3db95aba7ade 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m
+++ b/WordPress/Classes/ViewRelated/Notifications/Controllers/NotificationDetailsViewController.m
@@ -68,6 +68,9 @@ @interface NotificationDetailsViewController () <UITextViewDelegate, Suggestions
 @property (nonatomic, strong) NSArray                       *blockGroups;
 @property (nonatomic, assign) UIEdgeInsets                  firstRowInsets;
 
+// Media Helpers
+@property (nonatomic, strong) NotificationMediaDownloader   *mediaDownloader;
+
 // Model
 @property (nonatomic, strong) Notification                  *note;
 @end
@@ -94,19 +97,23 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.title                          = self.note.title;
-    self.restorationClass               = [self class];
-    self.view.backgroundColor           = [WPStyleGuide itsEverywhereGrey];
+    self.title                              = self.note.title;
+    self.restorationClass                   = [self class];
+    self.view.backgroundColor               = [WPStyleGuide itsEverywhereGrey];
     
     // Don't show the notification title in the next-view's back button
     UIBarButtonItem *backButton = [[UIBarButtonItem alloc] initWithTitle:[NSString string] style:UIBarButtonItemStylePlain target:nil action:nil];
-    self.navigationItem.backBarButtonItem = backButton;
+    self.navigationItem.backBarButtonItem   = backButton;
 
-    self.tableView.separatorStyle       = self.note.isBadge ? UITableViewCellSeparatorStyleNone : UITableViewCellSeparatorStyleSingleLine;
-    self.tableView.separatorInset       = UIEdgeInsetsZero;
-    self.tableView.separatorColor       = [WPStyleGuide notificationsBlockSeparatorColor];
-    self.tableView.backgroundColor      = [WPStyleGuide itsEverywhereGrey];
+    self.tableView.separatorStyle           = self.note.isBadge ? UITableViewCellSeparatorStyleNone : UITableViewCellSeparatorStyleSingleLine;
+    self.tableView.backgroundColor          = [WPStyleGuide itsEverywhereGrey];
+    self.tableView.accessibilityIdentifier  = @"Notification Details Table";
+    self.tableView.separatorInset           = UIEdgeInsetsZero;
+    self.tableView.separatorColor           = [WPStyleGuide notificationsBlockSeparatorColor];
+    self.tableView.backgroundColor          = [WPStyleGuide itsEverywhereGrey];
     
+    self.mediaDownloader                    = [[NotificationMediaDownloader alloc] initWithMaximumImageWidth:self.maxMediaEmbedWidth];
+
     self.reuseIdentifierMap = @{
         @(NoteBlockGroupTypeHeader)    : NoteBlockHeaderTableViewCell.reuseIdentifier,
         @(NoteBlockGroupTypeText)      : NoteBlockTextTableViewCell.reuseIdentifier,
@@ -120,7 +127,6 @@ - (void)viewDidLoad
                                              selector:@selector(handleNotificationChange:)
                                                  name:NSManagedObjectContextObjectsDidChangeNotification
                                                object:context];
-    self.tableView.accessibilityIdentifier = @"Notification Details Table";
 }
 
 - (void)viewWillAppear:(BOOL)animated
@@ -228,63 +234,71 @@ - (void)attachReplyViewIfNeeded
         return;
     }
     
-    // Attach the SuggestionsTableView for WPCOM blogs
-    NSManagedObjectContext *context = [[ContextManager sharedInstance] mainContext];
-    BlogService *service            = [[BlogService alloc] initWithManagedObjectContext:context];
-    Blog *blog                      = [service blogByBlogId:self.note.metaSiteID];
-        
-    BOOL shouldAddSuggestionView = (blog.isWPcom && [[SuggestionService sharedInstance] shouldShowSuggestionsForSiteID:self.note.metaSiteID]);
-    
-    if (shouldAddSuggestionView) {
-        self.suggestionsTableView = [[SuggestionsTableView alloc] initWithSiteID:self.note.metaSiteID];
-        self.suggestionsTableView.suggestionsDelegate = self;
-        [self.suggestionsTableView setTranslatesAutoresizingMaskIntoConstraints:NO];
-        [self.view addSubview:self.suggestionsTableView];        
-    }
-    
-    __typeof(self) __weak weakSelf  = self;
+    __typeof(self) __weak weakSelf          = self;
     
-    ReplyTextView *replyTextView    = [[ReplyTextView alloc] initWithWidth:CGRectGetWidth(self.view.frame)];
-    replyTextView.placeholder       = NSLocalizedString(@"Write a reply…", @"Placeholder text for inline compose view");
-    replyTextView.replyText         = [NSLocalizedString(@"Reply", @"") uppercaseString];
-    replyTextView.onReply           = ^(NSString *content) {
+    ReplyTextView *replyTextView            = [[ReplyTextView alloc] initWithWidth:CGRectGetWidth(self.view.frame)];
+    replyTextView.placeholder               = NSLocalizedString(@"Write a reply…", @"Placeholder text for inline compose view");
+    replyTextView.replyText                 = [NSLocalizedString(@"Reply", @"") uppercaseString];
+    replyTextView.accessibilityIdentifier   = @"Reply Text";
+    replyTextView.onReply                   = ^(NSString *content) {
         [weakSelf sendReplyWithBlock:block content:content];
     };
-    replyTextView.delegate          = self;
-    self.replyTextView              = replyTextView;
-    replyTextView.accessibilityIdentifier = @"Reply Text";
+    replyTextView.delegate                  = self;
+    self.replyTextView                      = replyTextView;
+
     // Attach the ReplyTextView at the very bottom
     [self.view addSubview:self.replyTextView];
     [self.view pinSubviewAtBottom:self.replyTextView];
     [self.view pinSubview:self.tableView aboveSubview:self.replyTextView];
     
-    // If allowing suggestions, set up the reply text view keyboard and suggestion view constraints
-    if (shouldAddSuggestionView) {
-        // Set reply text view keyboard type to Twitter to expose the @ key for easy suggesting
-        [replyTextView setKeyboardType:UIKeyboardTypeTwitter];
-        
-        // Pin the suggestions view left and right edges to the super view edges
-        NSDictionary *views = @{@"suggestionsview": self.suggestionsTableView };
-        [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[suggestionsview]|"
-                                                                          options:0
-                                                                          metrics:nil
-                                                                            views:views]];
-
-        // Pin the suggestions view top to the super view top
-        [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[suggestionsview]"
-                                                                          options:0
-                                                                          metrics:nil
-                                                                            views:views]];
-        
-        // Pin the suggestions view bottom to the top of the reply box
-        [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.suggestionsTableView
-                                                             attribute:NSLayoutAttributeBottom
-                                                             relatedBy:NSLayoutRelationEqual
-                                                                toItem:self.replyTextView
-                                                             attribute:NSLayoutAttributeTop
-                                                            multiplier:1
-                                                              constant:0]];
+    // Attach suggestionsView
+    [self attachSuggestionsViewIfNeeded];
+}
+
+
+#pragma mark - Suggestions View Helpers
+
+- (void)attachSuggestionsViewIfNeeded
+{
+    // Proceed only if needed!
+    NSManagedObjectContext *context = [[ContextManager sharedInstance] mainContext];
+    BlogService *service            = [[BlogService alloc] initWithManagedObjectContext:context];
+    Blog *blog                      = [service blogByBlogId:self.note.metaSiteID];
+    BOOL shouldAddSuggestionView    = blog.isWPcom && [[SuggestionService sharedInstance] shouldShowSuggestionsForSiteID:self.note.metaSiteID];
+
+    if (!shouldAddSuggestionView) {
+        return;
     }
+    
+    self.suggestionsTableView = [[SuggestionsTableView alloc] initWithSiteID:self.note.metaSiteID];
+    self.suggestionsTableView.suggestionsDelegate = self;
+    [self.suggestionsTableView setTranslatesAutoresizingMaskIntoConstraints:NO];
+    [self.view addSubview:self.suggestionsTableView];
+    
+    // Set reply text view keyboard type to Twitter to expose the @ key for easy suggesting
+    [self.replyTextView setKeyboardType:UIKeyboardTypeTwitter];
+    
+    // Pin the suggestions view left and right edges to the super view edges
+    NSDictionary *views = @{@"suggestionsview": self.suggestionsTableView };
+    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[suggestionsview]|"
+                                                                      options:0
+                                                                      metrics:nil
+                                                                        views:views]];
+
+    // Pin the suggestions view top to the super view top
+    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|[suggestionsview]"
+                                                                      options:0
+                                                                      metrics:nil
+                                                                        views:views]];
+    
+    // Pin the suggestions view bottom to the top of the reply box
+    [self.view addConstraint:[NSLayoutConstraint constraintWithItem:self.suggestionsTableView
+                                                         attribute:NSLayoutAttributeBottom
+                                                         relatedBy:NSLayoutRelationEqual
+                                                            toItem:self.replyTextView
+                                                         attribute:NSLayoutAttributeTop
+                                                        multiplier:1
+                                                          constant:0]];
 }
 
 
@@ -415,7 +429,7 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
 {
     NotificationBlockGroup *blockGroup      = [self blockGroupForIndexPath:indexPath];
     NoteBlockTableViewCell *tableViewCell   = self.layoutCellMap[@(blockGroup.type)] ?: self.layoutCellMap[@(NoteBlockGroupTypeText)];
-    
+
     [self setupCell:tableViewCell blockGroup:blockGroup];
 
     CGFloat height = [tableViewCell layoutHeightWithWidth:CGRectGetWidth(self.tableView.bounds)];
@@ -439,7 +453,8 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     NotificationBlockGroup *blockGroup      = [self blockGroupForIndexPath:indexPath];
     NSString *reuseIdentifier               = self.reuseIdentifierMap[@(blockGroup.type)] ?: self.reuseIdentifierMap[@(NoteBlockGroupTypeText)];
     NoteBlockTableViewCell *cell            = [tableView dequeueReusableCellWithIdentifier:reuseIdentifier forIndexPath:indexPath];
-    
+ 
+    [self enqueueMediaDownloads:blockGroup indexPath:indexPath];
     [self setupCell:cell blockGroup:blockGroup];
 
     return cell;
@@ -465,6 +480,35 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
 }
 
 
+#pragma mark - Media Download Helper
+
+- (void)enqueueMediaDownloads:(NotificationBlockGroup *)group indexPath:(NSIndexPath *)indexPath
+{
+    // Download Media: Only embeds for Text and Comment notifications
+    NSSet *richBlockTypes           = [NSSet setWithObjects:@(NoteBlockTypeText), @(NoteBlockTypeComment), nil];
+    NSSet *imageUrls                = [group imageUrlsForBlocksOfTypes:richBlockTypes];
+    __weak __typeof(self) weakSelf  = self;
+    
+    [self.mediaDownloader downloadMediaWithUrls:imageUrls completion:^{
+        [weakSelf.tableView reloadRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade];
+    }];
+}
+
+- (CGFloat)maxMediaEmbedWidth
+{
+    // Maximum Media Embed Width should match with the RichTextView's width in portrait mode
+    NoteBlockTextTableViewCell *textCell = self.layoutCellMap[@(NoteBlockGroupTypeText)];
+    NSAssert(textCell, @"Missing TextCell?");
+    
+    // Note: First iteration doesn't support embed resize on rotation. Let's take the portrait width
+    CGRect bounds           = self.view.bounds;
+    CGFloat portraitWidth   = [UIDevice isPad] ? WPTableViewFixedWidth : MIN(CGRectGetWidth(bounds), CGRectGetHeight(bounds));
+    CGFloat maxWidth        = portraitWidth - textCell.labelPadding.left - textCell.labelPadding.right;
+    
+    return maxWidth;
+}
+
+
 #pragma mark - NoteBlockTableViewCell Helpers
 
 - (void)setupCell:(NoteBlockTableViewCell *)cell blockGroup:(NotificationBlockGroup *)blockGroup
@@ -530,12 +574,21 @@ - (void)setupCommentCell:(NoteBlockCommentTableViewCell *)cell blockGroup:(Notif
     NotificationBlock *commentBlock = [blockGroup blockOfType:NoteBlockTypeComment];
     NotificationBlock *userBlock    = [blockGroup blockOfType:NoteBlockTypeUser];
     NotificationMedia *media        = userBlock.media.firstObject;
-    
     NSAssert(commentBlock, nil);
     NSAssert(userBlock, nil);
     
-    __weak __typeof(self) weakSelf  = self;
+    // Merge the Attachments with their ranges: [NSRange: UIImage]
+    NSDictionary *mediaMap          = [self.mediaDownloader imagesForUrls:commentBlock.imageUrls];
+    NSDictionary *mediaRanges       = [commentBlock buildRangesToImagesMap:mediaMap];
+    
+    // Timestamp: Append bullet character if we have a site title or url to show
+    NSString *site                  = userBlock.metaTitlesHome ?: userBlock.metaLinksHome.hostname;
+    NSString *timestamp             = [self.note.timestampAsDate shortString];
+    if (site) {
+        timestamp = [timestamp stringByAppendingString:@" • "];
+    }
     
+    // Setup the cell
     cell.isReplyEnabled             = [UIDevice isPad] && [commentBlock isActionOn:NoteActionReplyKey];
     cell.isLikeEnabled              = [commentBlock isActionEnabled:NoteActionLikeKey];
     cell.isApproveEnabled           = [commentBlock isActionEnabled:NoteActionApproveKey];
@@ -546,17 +599,15 @@ - (void)setupCommentCell:(NoteBlockCommentTableViewCell *)cell blockGroup:(Notif
     cell.isApproveOn                = [commentBlock isActionOn:NoteActionApproveKey];
     
     cell.name                       = userBlock.text;
-    // Append bullet character if we have a site title or url to show
-    cell.timestamp                  = (userBlock.metaTitleOrUrl) ?
-                        [[self.note.timestampAsDate shortString] stringByAppendingString:@" • "]
-                        : [self.note.timestampAsDate shortString];
-    cell.site                       = userBlock.metaTitleOrUrl;
-    cell.attributedCommentText      = commentBlock.regularAttributedTextOverride ?: commentBlock.regularAttributedText;
-
+    cell.attributedCommentText      = [commentBlock.richAttributedText stringByEmbeddingImageAttachments:mediaRanges];
+    cell.timestamp                  = timestamp;
+    cell.site                       = site;
+    
+    // Setup the Callbacks
+    __weak __typeof(self) weakSelf  = self;
     cell.onUrlClick                 = ^(NSURL *url){
         [weakSelf openURL:url];
     };
-    
     cell.onReplyClick               = ^(UIButton * sender){
         [weakSelf editReplyWithBlock:commentBlock];
     };
@@ -615,10 +666,16 @@ - (void)setupTextCell:(NoteBlockTextTableViewCell *)cell blockGroup:(Notificatio
     NotificationBlock *textBlock    = blockGroup.blocks.firstObject;
     NSAssert(textBlock, nil);
     
-    __weak __typeof(self) weakSelf  = self;
+    // Merge the Attachments with their ranges: [NSRange: UIImage]
+    NSDictionary *mediaMap          = [self.mediaDownloader imagesForUrls:textBlock.imageUrls];
+    NSDictionary *mediaRanges       = [textBlock buildRangesToImagesMap:mediaMap];
+    
+    // Setup the Cell
+    cell.attributedText             = [textBlock.richAttributedText stringByEmbeddingImageAttachments:mediaRanges];
+    cell.isBadge                    = textBlock.isBadge;
     
-    cell.attributedText             = textBlock.regularAttributedText;
-    cell.isBadge                    = self.note.isBadge;
+    // Setup the Callbacks
+    __weak __typeof(self) weakSelf  = self;
     cell.onUrlClick                 = ^(NSURL *url){
         [weakSelf openURL:url];
     };
@@ -630,10 +687,7 @@ - (void)setupTextCell:(NoteBlockTextTableViewCell *)cell blockGroup:(Notificatio
 - (void)openURL:(NSURL *)url
 {
     //  NOTE:
-    //
-    //  DTAttributedLabel doesn't allow us to use *any* object as a DTLinkAttribute instance.
-    //  So, we lose the range metadata: is it a post? stats? comment?.
-    //  In this step, we attempt to match the URL with any NotificationRange instance, contained in the note,
+    //  In this step, we attempt to match the URL tapped with any NotificationRange instance, contained in the note,
     //  and thus, recover the metadata!
     //
     NotificationRange *range    = [self.note notificationRangeWithUrl:url];
@@ -1101,6 +1155,7 @@ - (void)textViewDidEndEditing:(UITextView *)textView
     self.tableGesturesRecognizer.enabled = false;
 }
 
+
 #pragma mark - SuggestionsTableViewDelegate
 
 - (void)view:(UIView *)view didTypeInWord:(NSString *)word
@@ -1114,6 +1169,7 @@ - (void)suggestionsTableView:(SuggestionsTableView *)suggestionsTableView didSel
     [suggestionsTableView showSuggestionsForWord:@""];
 }
 
+
 #pragma mark - Gestures Recognizer Delegate
 
 - (IBAction)dismissKeyboardIfNeeded:(id)sender
diff --git a/WordPress/Classes/ViewRelated/Notifications/Notifications.storyboard b/WordPress/Classes/ViewRelated/Notifications/Notifications.storyboard
index fefb0ef9e304..2afcdceb10b4 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Notifications.storyboard
+++ b/WordPress/Classes/ViewRelated/Notifications/Notifications.storyboard
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="MbC-cA-c9S">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14B17" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="MbC-cA-c9S">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
-        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <scenes>
         <!--Notification List Controller-->
@@ -120,7 +119,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GLh-mA-WVS" customClass="WPDynamicHeightTextView" customModule="WordPress" customModuleProvider="target">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GLh-mA-WVS" customClass="RichTextView" customModule="WordPress">
                                                     <rect key="frame" x="12" y="4" width="296" height="35"/>
                                                     <color key="backgroundColor" red="0.9215686917" green="0.93333339689999995" blue="0.94901967050000002" alpha="1" colorSpace="deviceRGB"/>
                                                 </view>
@@ -138,7 +137,7 @@
                                             <outlet property="textView" destination="GLh-mA-WVS" id="vt4-wS-IQt"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="NoteBlockCommentTableViewCell" rowHeight="130" id="FtC-SI-oJr" userLabel="Comment" customClass="NoteBlockCommentTableViewCell" customModule="WordPress">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="NoteBlockCommentTableViewCell" rowHeight="141" id="FtC-SI-oJr" userLabel="Comment" customClass="NoteBlockCommentTableViewCell" customModule="WordPress">
                                         <rect key="frame" x="0.0" y="99" width="320" height="85"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="FtC-SI-oJr" id="7qg-ok-Rbo">
@@ -146,10 +145,10 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="g23-xL-FVr" userLabel="Approval Status">
-                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="75"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="320" height="85.5"/>
                                                     <subviews>
                                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eXO-Zm-IMb" userLabel="Approval Sidebar">
-                                                            <rect key="frame" x="0.0" y="0.0" width="3" height="75"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="3" height="85.5"/>
                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="3" id="7HL-GO-DSv"/>
@@ -171,8 +170,9 @@
                                                     </constraints>
                                                 </imageView>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Username" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uYt-ov-kC3">
-                                                    <rect key="frame" x="54" y="8" width="188" height="15"/>
+                                                    <rect key="frame" x="54" y="8" width="188" height="18.5"/>
                                                     <constraints>
+                                                        <constraint firstAttribute="height" constant="18" id="dzw-U0-phf"/>
                                                         <constraint firstAttribute="width" constant="188" id="tqG-8i-PGz"/>
                                                     </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
@@ -180,38 +180,35 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="249" horizontalCompressionResistancePriority="749" verticalCompressionResistancePriority="749" text="Timestamp" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sed-4I-XCW">
-                                                    <rect key="frame" x="54" y="23" width="62" height="15"/>
+                                                    <rect key="frame" x="54" y="26" width="62" height="18"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="18" id="cFo-fQ-oUa"/>
+                                                    </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                     <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" verticalHuggingPriority="248" horizontalCompressionResistancePriority="748" verticalCompressionResistancePriority="748" contentHorizontalAlignment="left" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="tailTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AlJ-oZ-81Y">
-                                                    <rect key="frame" x="116" y="17" width="192" height="27"/>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Site" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bj4-em-dha" userLabel="Site">
+                                                    <rect key="frame" x="116" y="26.5" width="22" height="18"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="12"/>
-                                                    <state key="normal" title="Site Url">
-                                                        <color key="titleColor" cocoaTouchSystemColor="darkTextColor"/>
-                                                        <color key="titleShadowColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
-                                                    </state>
-                                                    <connections>
-                                                        <action selector="siteWasPressed:" destination="FtC-SI-oJr" eventType="touchUpInside" id="mtb-OE-AVW"/>
-                                                    </connections>
-                                                </button>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N7y-ge-mMq" customClass="WPDynamicHeightTextView" customModule="WordPress" customModuleProvider="target">
-                                                    <rect key="frame" x="12" y="38" width="296" height="28"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N7y-ge-mMq" customClass="RichTextView" customModule="WordPress">
+                                                    <rect key="frame" x="12" y="49" width="296" height="28.5"/>
                                                     <color key="backgroundColor" red="0.9215686917" green="0.93333339689999995" blue="0.94901967050000002" alpha="1" colorSpace="deviceRGB"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" relation="greaterThanOrEqual" priority="250" constant="28" id="fpi-gI-JQb"/>
                                                     </constraints>
                                                 </view>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WpC-gY-myP" userLabel="Separator View">
-                                                    <rect key="frame" x="12" y="75" width="296" height="1"/>
+                                                    <rect key="frame" x="12" y="85" width="296" height="1"/>
                                                     <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="1" id="BUp-fs-LKw"/>
                                                     </constraints>
                                                 </view>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kdg-f8-pBH" userLabel="Reply" customClass="VerticallyStackedButton">
-                                                    <rect key="frame" x="120" y="87" width="20" height="30"/>
+                                                    <rect key="frame" x="120" y="98" width="20" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="Jbk-z2-z1U"/>
                                                     </constraints>
@@ -227,7 +224,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="e1p-ec-Dn3" customClass="VerticallyStackedButton">
-                                                    <rect key="frame" x="160" y="87" width="20" height="30"/>
+                                                    <rect key="frame" x="160" y="98" width="20" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="jzW-8y-eL4"/>
                                                     </constraints>
@@ -243,7 +240,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dZU-ho-dbu" customClass="VerticallyStackedButton">
-                                                    <rect key="frame" x="200" y="87" width="20" height="30"/>
+                                                    <rect key="frame" x="200" y="98" width="20" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="oj5-pk-p8y"/>
                                                     </constraints>
@@ -259,7 +256,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="q3a-Aa-VqY" customClass="VerticallyStackedButton">
-                                                    <rect key="frame" x="240" y="87" width="20" height="30"/>
+                                                    <rect key="frame" x="240" y="98" width="20" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="20" id="aqK-WO-00U"/>
                                                     </constraints>
@@ -273,7 +270,7 @@
                                                     </connections>
                                                 </button>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ab9-Eo-ue1" customClass="VerticallyStackedButton">
-                                                    <rect key="frame" x="280" y="87" width="20" height="30"/>
+                                                    <rect key="frame" x="280" y="98" width="20" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="height" constant="30" id="qlj-w2-KrE"/>
                                                         <constraint firstAttribute="width" constant="20" id="xMy-8x-DnT"/>
@@ -289,19 +286,20 @@
                                                 </button>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstItem="AlJ-oZ-81Y" firstAttribute="leading" secondItem="Sed-4I-XCW" secondAttribute="trailing" id="0Ig-1q-eAI"/>
                                                 <constraint firstItem="Sed-4I-XCW" firstAttribute="top" secondItem="uYt-ov-kC3" secondAttribute="bottom" id="0tB-qY-EKh"/>
                                                 <constraint firstItem="WpC-gY-myP" firstAttribute="leading" secondItem="N7y-ge-mMq" secondAttribute="leading" id="1Ls-AD-Oax"/>
                                                 <constraint firstAttribute="trailing" secondItem="g23-xL-FVr" secondAttribute="trailing" id="2s9-XW-r28"/>
-                                                <constraint firstItem="N7y-ge-mMq" firstAttribute="top" secondItem="Sed-4I-XCW" secondAttribute="bottom" id="3U0-f4-gTF"/>
                                                 <constraint firstItem="dAK-Dd-Cvw" firstAttribute="top" secondItem="7qg-ok-Rbo" secondAttribute="top" constant="12" id="5nR-rf-CxY"/>
                                                 <constraint firstItem="q3a-Aa-VqY" firstAttribute="leading" secondItem="dZU-ho-dbu" secondAttribute="trailing" constant="20" id="5uM-TI-L7f"/>
+                                                <constraint firstItem="bj4-em-dha" firstAttribute="top" secondItem="Sed-4I-XCW" secondAttribute="top" id="8g5-Mg-Usr"/>
+                                                <constraint firstItem="bj4-em-dha" firstAttribute="bottom" secondItem="Sed-4I-XCW" secondAttribute="bottom" id="9Hn-dx-JES"/>
                                                 <constraint firstItem="dZU-ho-dbu" firstAttribute="bottom" secondItem="Ab9-Eo-ue1" secondAttribute="bottom" id="DnX-GQ-fdB"/>
-                                                <constraint firstAttribute="trailingMargin" secondItem="AlJ-oZ-81Y" secondAttribute="trailing" constant="4" id="EVc-Xs-w5q"/>
                                                 <constraint firstItem="Sed-4I-XCW" firstAttribute="leading" secondItem="uYt-ov-kC3" secondAttribute="leading" id="F0P-xr-DTi"/>
                                                 <constraint firstItem="dAK-Dd-Cvw" firstAttribute="top" secondItem="uYt-ov-kC3" secondAttribute="top" constant="4" id="Fyu-hc-Dfp"/>
+                                                <constraint firstItem="N7y-ge-mMq" firstAttribute="top" secondItem="dAK-Dd-Cvw" secondAttribute="bottom" constant="5" id="GVW-k5-hOX"/>
                                                 <constraint firstItem="N7y-ge-mMq" firstAttribute="leading" secondItem="7qg-ok-Rbo" secondAttribute="leading" constant="12" id="J6e-4J-hog"/>
                                                 <constraint firstItem="g23-xL-FVr" firstAttribute="leading" secondItem="7qg-ok-Rbo" secondAttribute="leading" id="JGW-wU-9Nd"/>
+                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="bj4-em-dha" secondAttribute="trailing" constant="12" id="JeT-Ca-4P6"/>
                                                 <constraint firstAttribute="trailing" secondItem="Ab9-Eo-ue1" secondAttribute="trailing" constant="20" id="KDn-Ow-HF5"/>
                                                 <constraint firstItem="q3a-Aa-VqY" firstAttribute="bottom" secondItem="Ab9-Eo-ue1" secondAttribute="bottom" id="Luo-X2-lxA"/>
                                                 <constraint firstItem="Ab9-Eo-ue1" firstAttribute="bottom" secondItem="e1p-ec-Dn3" secondAttribute="bottom" id="T4i-k6-wFD"/>
@@ -313,14 +311,14 @@
                                                 <constraint firstItem="WpC-gY-myP" firstAttribute="top" secondItem="g23-xL-FVr" secondAttribute="bottom" id="cha-cK-B2r"/>
                                                 <constraint firstItem="g23-xL-FVr" firstAttribute="top" secondItem="7qg-ok-Rbo" secondAttribute="top" id="g5b-GJ-nr2"/>
                                                 <constraint firstItem="Ab9-Eo-ue1" firstAttribute="height" secondItem="e1p-ec-Dn3" secondAttribute="height" id="kBl-AS-UbE"/>
-                                                <constraint firstItem="Sed-4I-XCW" firstAttribute="centerY" secondItem="AlJ-oZ-81Y" secondAttribute="centerY" id="mUy-O5-axC"/>
                                                 <constraint firstItem="uYt-ov-kC3" firstAttribute="leading" secondItem="dAK-Dd-Cvw" secondAttribute="trailing" constant="10" id="n5G-wD-KRZ"/>
-                                                <constraint firstItem="Ab9-Eo-ue1" firstAttribute="top" secondItem="N7y-ge-mMq" secondAttribute="bottom" constant="21" id="pOK-8H-PLa"/>
-                                                <constraint firstItem="WpC-gY-myP" firstAttribute="top" secondItem="N7y-ge-mMq" secondAttribute="bottom" constant="9" id="prj-ah-8ZK"/>
+                                                <constraint firstItem="Ab9-Eo-ue1" firstAttribute="top" secondItem="N7y-ge-mMq" secondAttribute="bottom" priority="250" constant="20" id="pOK-8H-PLa"/>
+                                                <constraint firstItem="WpC-gY-myP" firstAttribute="top" secondItem="N7y-ge-mMq" secondAttribute="bottom" constant="8" id="prj-ah-8ZK"/>
                                                 <constraint firstItem="Ab9-Eo-ue1" firstAttribute="bottom" secondItem="Kdg-f8-pBH" secondAttribute="bottom" id="u1Z-Hp-9XN"/>
                                                 <constraint firstItem="Ab9-Eo-ue1" firstAttribute="leading" secondItem="q3a-Aa-VqY" secondAttribute="trailing" constant="20" id="vhg-mW-OJq"/>
                                                 <constraint firstAttribute="trailing" secondItem="N7y-ge-mMq" secondAttribute="trailing" constant="12" id="voR-xo-QDx"/>
                                                 <constraint firstAttribute="bottom" secondItem="Ab9-Eo-ue1" secondAttribute="bottom" constant="12" id="wQc-o4-BEX"/>
+                                                <constraint firstItem="bj4-em-dha" firstAttribute="leading" secondItem="Sed-4I-XCW" secondAttribute="trailing" id="xgi-b8-9W1"/>
                                                 <constraint firstItem="WpC-gY-myP" firstAttribute="trailing" secondItem="N7y-ge-mMq" secondAttribute="trailing" id="yn9-9L-fYV"/>
                                                 <constraint firstItem="dAK-Dd-Cvw" firstAttribute="leading" secondItem="7qg-ok-Rbo" secondAttribute="leading" constant="12" id="zem-mU-Tgv"/>
                                             </constraints>
@@ -332,11 +330,11 @@
                                             <outlet property="btnLike" destination="e1p-ec-Dn3" id="HMC-LX-m8X"/>
                                             <outlet property="btnMore" destination="Ab9-Eo-ue1" id="W9i-90-82S"/>
                                             <outlet property="btnReply" destination="Kdg-f8-pBH" id="k4P-Wf-dFk"/>
-                                            <outlet property="btnSite" destination="AlJ-oZ-81Y" id="WQL-af-r0p"/>
                                             <outlet property="btnTrash" destination="q3a-Aa-VqY" id="vN5-93-aA4"/>
                                             <outlet property="gravatarImageView" destination="dAK-Dd-Cvw" id="QLC-K4-YZR"/>
                                             <outlet property="nameLabel" destination="uYt-ov-kC3" id="iUh-rH-6T4"/>
                                             <outlet property="separatorView" destination="WpC-gY-myP" id="upt-Qi-Clg"/>
+                                            <outlet property="siteLabel" destination="bj4-em-dha" id="rEs-Pg-lbH"/>
                                             <outlet property="textView" destination="N7y-ge-mMq" id="Cbg-kZ-aBg"/>
                                             <outlet property="timestampLabel" destination="Sed-4I-XCW" id="Sc4-Hw-skT"/>
                                         </connections>
diff --git a/WordPress/Classes/ViewRelated/Notifications/Tools/ReplyBezierView.swift b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyBezierView.swift
similarity index 100%
rename from WordPress/Classes/ViewRelated/Notifications/Tools/ReplyBezierView.swift
rename to WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyBezierView.swift
diff --git a/WordPress/Classes/ViewRelated/Notifications/Tools/ReplyTextView.swift b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift
similarity index 100%
rename from WordPress/Classes/ViewRelated/Notifications/Tools/ReplyTextView.swift
rename to WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.swift
diff --git a/WordPress/Classes/ViewRelated/Notifications/Tools/ReplyTextView.xib b/WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib
similarity index 100%
rename from WordPress/Classes/ViewRelated/Notifications/Tools/ReplyTextView.xib
rename to WordPress/Classes/ViewRelated/Notifications/ReplyTextView/ReplyTextView.xib
diff --git a/WordPress/Classes/ViewRelated/Notifications/RichTextView/NSAttributedString+RichTextView.swift b/WordPress/Classes/ViewRelated/Notifications/RichTextView/NSAttributedString+RichTextView.swift
new file mode 100644
index 000000000000..da4d19bbcaab
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Notifications/RichTextView/NSAttributedString+RichTextView.swift
@@ -0,0 +1,25 @@
+import Foundation
+import UIKit
+
+
+// NOTE: 
+// This is not cool. The reason why we need this constant, is because DTCoreText overrides NSAttachmentAttributeName.
+// Even using Swift's namespaces ("UIKit.NSAttachmentAttributeName") doesn't return the right value.
+// Please, nuke DTCoreText, and remove this constant.
+//
+public let UIKitAttachmentAttributeName = "NSAttachment"
+
+extension NSAttributedString
+{
+    public func enumerateAttachments(block: (attachment: NSTextAttachment, range: NSRange) -> ()) {
+        let range = NSMakeRange(0, length)
+
+        enumerateAttribute(UIKitAttachmentAttributeName, inRange: range, options: .LongestEffectiveRangeNotRequired) {
+            (value: AnyObject!, range: NSRange, stop: UnsafeMutablePointer<ObjCBool>) -> Void in
+            
+            if let attachment = value as? NSTextAttachment {
+                block(attachment: attachment, range: range)
+            }
+        }
+    }
+}
diff --git a/WordPress/Classes/ViewRelated/Notifications/RichTextView/RichTextView.swift b/WordPress/Classes/ViewRelated/Notifications/RichTextView/RichTextView.swift
new file mode 100644
index 000000000000..81a469ef5ab7
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Notifications/RichTextView/RichTextView.swift
@@ -0,0 +1,247 @@
+import Foundation
+
+
+@objc public protocol RichTextViewDataSource
+{
+    optional func textView(textView: UITextView, viewForTextAttachment attachment: NSTextAttachment) -> UIView?
+}
+
+@objc public protocol RichTextViewDelegate : UITextViewDelegate
+{
+    optional func textView(textView: UITextView, didPressLink link: NSURL)
+}
+
+
+@objc public class RichTextView : UIView, UITextViewDelegate
+{
+    public var dataSource:  RichTextViewDataSource?
+    public var delegate:    RichTextViewDelegate?
+    
+    
+    // MARK: - Initializers
+    public override init() {
+        super.init()
+        setupSubviews()
+    }
+    
+    public override init(frame: CGRect) {
+        super.init(frame: frame)
+        setupSubviews()
+    }
+
+    public required init(coder aDecoder: NSCoder) {
+        super.init(coder: aDecoder)
+        setupSubviews()
+    }
+    
+    
+    // MARK: - Properties    
+    public var contentInset: UIEdgeInsets = UIEdgeInsetsZero {
+        didSet {
+            textView?.contentInset = contentInset
+        }
+    }
+
+    public var textContainerInset: UIEdgeInsets = UIEdgeInsetsZero {
+        didSet {
+            textView?.textContainerInset = textContainerInset
+        }
+    }
+    
+    public var attributedText: NSAttributedString! {
+        didSet {
+            assert(textView != nil)
+            textView.attributedText = attributedText ??  NSAttributedString()
+            renderAttachments()
+        }
+    }
+    
+    public var editable: Bool = false {
+        didSet {
+            textView?.editable = editable
+        }
+    }
+
+    public var selectable: Bool = true {
+        didSet {
+            textView?.selectable = selectable
+        }
+    }
+    
+    public var dataDetectorTypes: UIDataDetectorTypes = .None {
+        didSet {
+            textView?.dataDetectorTypes = dataDetectorTypes
+        }
+    }
+    
+    public override var backgroundColor: UIColor? {
+        didSet {
+            textView?.backgroundColor = backgroundColor
+        }
+    }
+    
+    public var linkTextAttributes: [NSObject : AnyObject]! {
+        didSet {
+            textView?.linkTextAttributes = linkTextAttributes
+        }
+    }
+    
+    
+    // MARK: - TextKit Getters
+    public var layoutManager: NSLayoutManager {
+        get {
+            return textView.layoutManager
+        }
+    }
+    
+    public var textStorage: NSTextStorage {
+        get {
+            return textView.textStorage
+        }
+    }
+    
+    public var textContainer: NSTextContainer {
+        get {
+            return textView.textContainer
+        }
+    }
+
+    
+    // MARK: - Autolayout Helpers
+    public var preferredMaxLayoutWidth: CGFloat = 0 {
+        didSet {
+            invalidateIntrinsicContentSize()
+        }
+    }
+
+    public override func intrinsicContentSize() -> CGSize {
+        // Fix: Let's add 1pt extra size. There are few scenarios in which text gets clipped by 1 point
+        let bottomPadding   = CGFloat(1)
+        let maxWidth        = (preferredMaxLayoutWidth != 0) ? preferredMaxLayoutWidth : frame.width
+        let maxSize         = CGSize(width: maxWidth, height: CGFloat.max)
+        let requiredSize    = textView!.sizeThatFits(maxSize)
+        let roundedSize     = CGSize(width: ceil(requiredSize.width), height: ceil(requiredSize.height) + bottomPadding)
+        
+        return roundedSize
+    }
+    
+    
+    // MARK: - Private Methods
+    private func setupSubviews() {
+        gesturesRecognizer                                  = UITapGestureRecognizer()
+        gesturesRecognizer.addTarget(self, action: "handleTextViewTap:")
+        
+        textView                                            = UITextView(frame: bounds)
+        textView.backgroundColor                            = backgroundColor
+        textView.contentInset                               = UIEdgeInsetsZero
+        textView.textContainerInset                         = UIEdgeInsetsZero
+        textView.textContainer.lineFragmentPadding          = 0
+        textView.layoutManager.allowsNonContiguousLayout    = false
+        textView.editable                                   = editable
+        textView.dataDetectorTypes                          = dataDetectorTypes
+        textView.delegate                                   = self
+        textView.gestureRecognizers                         = [gesturesRecognizer]
+        addSubview(textView)
+        
+        // Setup Layout
+        textView.setTranslatesAutoresizingMaskIntoConstraints(false)
+        pinSubviewToAllEdges(textView)
+    }
+
+    private func renderAttachments() {
+        // Nuke old attachments
+        attachmentViews.map { $0.removeFromSuperview() }
+        attachmentViews.removeAll(keepCapacity: false)
+        
+        // Proceed only if needed
+        if attributedText == nil {
+            return
+        }
+        
+        // Load new attachments
+        attributedText.enumerateAttachments {
+            (attachment: NSTextAttachment, range: NSRange) -> () in
+            
+            let attachmentView = self.dataSource?.textView?(self.textView, viewForTextAttachment: attachment)
+            if attachmentView == nil {
+                return
+            }
+            
+            let unwrappedView           = attachmentView!
+            unwrappedView.frame.origin  = self.textView.frameForTextInRange(range).integerRect.origin
+            self.textView.addSubview(unwrappedView)
+            self.attachmentViews.append(unwrappedView)
+        }
+    }
+
+    
+    // MARK: - UITapGestureRecognizer Helpers
+    public func handleTextViewTap(recognizer: UITapGestureRecognizer) {
+        
+        // NOTE: Why do we need this?
+        // Because this mechanism allows us to disable DataDetectors, and yet, detect taps on links.
+        //
+        let textStorage         = textView.textStorage
+        let layoutManager       = textView.layoutManager
+        let textContainer       = textView.textContainer
+        
+        let locationInTextView  = recognizer.locationInView(textView)
+        let characterIndex      = layoutManager.characterIndexForPoint(locationInTextView,
+                                                                        inTextContainer: textContainer,
+                                                                        fractionOfDistanceBetweenInsertionPoints: nil)
+        
+        if characterIndex >= textStorage.length {
+            return
+        }
+        
+        // Load the NSURL instance, if any
+        let rawURL = textStorage.attribute(NSLinkAttributeName, atIndex: characterIndex, effectiveRange: nil) as? NSURL
+        if let unwrappedURL = rawURL {
+            delegate?.textView?(textView, didPressLink: unwrappedURL)
+        }
+    }
+    
+    
+    // MARK: - UITextViewDelegate Wrapped Methods
+    public func textViewShouldBeginEditing(textView: UITextView) -> Bool {
+        return delegate?.textViewShouldBeginEditing?(textView) ?? true
+    }
+    
+    public func textViewShouldEndEditing(textView: UITextView) -> Bool {
+        return delegate?.textViewShouldEndEditing?(textView) ?? true
+    }
+    
+    public func textViewDidBeginEditing(textView: UITextView) {
+        delegate?.textViewDidBeginEditing?(textView)
+    }
+    
+    public func textViewDidEndEditing(textView: UITextView) {
+        delegate?.textViewDidEndEditing?(textView)
+    }
+    
+    public func textView(textView: UITextView, shouldChangeTextInRange range: NSRange, replacementText text: String) -> Bool {
+        return delegate?.textView?(textView, shouldChangeTextInRange: range, replacementText: text) ?? true
+    }
+    
+    public func textViewDidChange(textView: UITextView) {
+        delegate?.textViewDidChange?(textView)
+    }
+    
+    public func textViewDidChangeSelection(textView: UITextView) {
+        delegate?.textViewDidChangeSelection?(textView)
+    }
+    
+    public func textView(textView: UITextView, shouldInteractWithURL URL: NSURL, inRange characterRange: NSRange) -> Bool {
+        return delegate?.textView?(textView, shouldInteractWithURL: URL, inRange: characterRange) ?? true
+    }
+    
+    public func textView(textView: UITextView, shouldInteractWithTextAttachment textAttachment: NSTextAttachment, inRange characterRange: NSRange) -> Bool {
+        return delegate?.textView?(textView, shouldInteractWithTextAttachment: textAttachment, inRange: characterRange) ?? true
+    }
+    
+    
+    // MARK: - Private Properites
+    private var textView:           UITextView!
+    private var gesturesRecognizer: UITapGestureRecognizer!
+    private var attachmentViews:    [UIView] = []
+}
diff --git a/WordPress/Classes/ViewRelated/Notifications/RichTextView/UITextView+RichTextView.swift b/WordPress/Classes/ViewRelated/Notifications/RichTextView/UITextView+RichTextView.swift
new file mode 100644
index 000000000000..e961cb2389d5
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Notifications/RichTextView/UITextView+RichTextView.swift
@@ -0,0 +1,14 @@
+import Foundation
+
+
+extension UITextView
+{
+    func frameForTextInRange(range: NSRange) -> CGRect {
+        let firstPosition   = positionFromPosition(beginningOfDocument, offset: range.location)
+        let lastPosition    = positionFromPosition(beginningOfDocument, offset: range.location + range.length)
+        let textRange       = textRangeFromPosition(firstPosition, toPosition: lastPosition)
+        let textFrame       = firstRectForRange(textRange)
+        
+        return textFrame
+    }
+}
diff --git a/WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift b/WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift
index 8a6feacf4430..b7c2fb62e502 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Style/WPStyleGuide+Notifications.swift
@@ -5,7 +5,7 @@ extension WPStyleGuide
 {
     public struct Notifications
     {
-        // Styles Used by NotificationsViewController
+        // MARK: - Styles Used by NotificationsViewController
         //
 
         //  NoteTableViewCell
@@ -19,29 +19,23 @@ extension WPStyleGuide
         public static let noteBackgroundUnreadColor = UIColor(red: 0xF1/255.0, green: 0xF6/255.0, blue: 0xF9/255.0, alpha: 0xFF/255.0)
 
         //  Subject Text
-        public static let subjectColor              = WPStyleGuide.littleEddieGrey()
-        public static let subjectRegularFont        = WPFontManager.openSansRegularFontOfSize(subjectFontSize)
-        public static let subjectBoldFont           = WPFontManager.openSansBoldFontOfSize(subjectFontSize)
-        public static let subjectItalicsFont        = WPFontManager.openSansItalicFontOfSize(subjectFontSize)
-
         public static let subjectRegularStyle       = [ NSParagraphStyleAttributeName:  subjectParagraph,
                                                         NSFontAttributeName:            subjectRegularFont,
                                                         NSForegroundColorAttributeName: subjectColor ]
-
+        
         public static let subjectBoldStyle          = [ NSParagraphStyleAttributeName:  subjectParagraph,
                                                         NSFontAttributeName:            subjectBoldFont ]
         
         public static let subjectItalicsStyle       = [ NSParagraphStyleAttributeName:  subjectParagraph,
                                                         NSFontAttributeName:            subjectItalicsFont ]
-
+        
         //  Subject Snippet
-        public static let snippetColor              = WPStyleGuide.allTAllShadeGrey()
+        private static let snippetColor             = WPStyleGuide.allTAllShadeGrey()
         public static let snippetRegularStyle       = [ NSParagraphStyleAttributeName:  snippetParagraph,
                                                         NSFontAttributeName:            subjectRegularFont,
                                                         NSForegroundColorAttributeName: snippetColor ]
 
-
-        // Styles used by NotificationDetailsViewController
+        // MARK: - Styles used by NotificationDetailsViewController
         //
 
         //  Header
@@ -76,11 +70,15 @@ extension WPStyleGuide
         public static let blockItalicsStyle         = [ NSParagraphStyleAttributeName:  blockParagraph,
                                                         NSFontAttributeName:            blockItalicsFont,
                                                         NSForegroundColorAttributeName: blockTextColor]
-
+        
         public static let blockQuotedStyle          = [ NSParagraphStyleAttributeName:  blockParagraph,
                                                         NSFontAttributeName:            blockItalicsFont,
                                                         NSForegroundColorAttributeName: blockQuotedColor]
-
+        
+        public static let blockBadgeStyle           = [ NSParagraphStyleAttributeName:  badgeParagraph,
+                                                        NSFontAttributeName:            blockRegularFont,
+                                                        NSForegroundColorAttributeName: blockTextColor]
+        
         //  Badges
         public static let badgeBackgroundColor      = UIColor.clearColor()
 
@@ -88,19 +86,12 @@ extension WPStyleGuide
         public static let blockActionDisabledColor  = UIColor(red: 0x7F/255.0, green: 0x9E/255.0, blue: 0xB4/255.0, alpha: 0xFF/255.0)
         public static let blockActionEnabledColor   = UIColor(red: 0xEA/255.0, green: 0x6D/255.0, blue: 0x1B/255.0, alpha: 0xFF/255.0)
 
-        // Helper Methods
-        public static func blockParagraphStyleWithIndentation(indentation: CGFloat) -> NSParagraphStyle {
-            let paragraph                   = blockParagraph.mutableCopy() as NSMutableParagraphStyle
-            paragraph.firstLineHeadIndent   = indentation
-            return paragraph
-        }
-
-        public static func blockParagraphStyleWithAlignment(alignment: NSTextAlignment) -> NSParagraphStyle {
-            let paragraph                   = blockParagraph.mutableCopy() as NSMutableParagraphStyle
-            paragraph.alignment             = alignment
-            return paragraph
+        //  RichText Helpers
+        public static func blockBackgroundColorForRichText(isBadge: Bool) -> UIColor {
+            return isBadge ? badgeBackgroundColor : blockBackgroundColor
         }
-
+        
+        //  Comment Helpers
         public static func blockTextColorForComment(isApproved approved: Bool) -> UIColor {
             return approved ? blockTextColor : blockUnapprovedTextColor
         }
@@ -117,12 +108,17 @@ extension WPStyleGuide
             return approved ? blockLinkColor : blockUnapprovedTextColor
         }
 
-        //  Private
+        
+        // MARK: - Private Propreties
+        //
+        
+        // Constants
         private static let subjectFontSize          = UIDevice.isPad() ? CGFloat(16) : CGFloat(14)
         private static let subjectLineSize          = UIDevice.isPad() ? CGFloat(24) : CGFloat(18)
         private static let blockFontSize            = UIDevice.isPad() ? CGFloat(16) : CGFloat(14)
         private static let blockLineSize            = UIDevice.isPad() ? CGFloat(24) : CGFloat(20)
 
+        // ParagraphStyle's
         private static let subjectParagraph         = NSMutableParagraphStyle(
             minLineHeight: subjectLineSize, maxLineHeight: subjectLineSize, lineBreakMode: .ByWordWrapping, alignment: .Left
         )
@@ -130,8 +126,19 @@ extension WPStyleGuide
             minLineHeight: subjectLineSize, maxLineHeight: subjectLineSize, lineBreakMode: .ByTruncatingTail, alignment: .Left
         )
         private static let blockParagraph           = NSMutableParagraphStyle(
-            minLineHeight: blockLineSize, maxLineHeight: blockLineSize, lineBreakMode: .ByWordWrapping, alignment: .Left
+            minLineHeight: blockLineSize, lineBreakMode: .ByWordWrapping, alignment: .Left
+        )
+        private static let badgeParagraph           = NSMutableParagraphStyle(
+            minLineHeight: blockLineSize, maxLineHeight: blockLineSize, lineBreakMode: .ByWordWrapping, alignment: .Center
         )
+
+        // Colors
+        private static let subjectColor             = WPStyleGuide.littleEddieGrey()
+        
+        // Fonts
+        private static let subjectRegularFont       = WPFontManager.openSansRegularFontOfSize(subjectFontSize)
+        private static let subjectBoldFont          = WPFontManager.openSansBoldFontOfSize(subjectFontSize)
+        private static let subjectItalicsFont       = WPFontManager.openSansItalicFontOfSize(subjectFontSize)
     }
     
     // MARK: - ObjectiveC Helpers: Nuke me once NotificationDetailsViewController is Swifted!
diff --git a/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift b/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift
new file mode 100644
index 000000000000..876c3c5ba4eb
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Notifications/Tools/NotificationMediaDownloader.swift
@@ -0,0 +1,140 @@
+import Foundation
+
+
+@objc public class NotificationMediaDownloader : NSObject
+{
+    deinit {
+        downloadQueue.cancelAllOperations()
+    }
+    
+    public init(maximumImageWidth: CGFloat) {
+        downloadQueue       = NSOperationQueue()
+        resizeQueue         = dispatch_queue_create("org.wordpress.notifications.media-downloader", DISPATCH_QUEUE_CONCURRENT)
+        mediaMap            = [NSURL: UIImage]()
+        retryMap            = [NSURL: Int]()
+        maxImageWidth       = maximumImageWidth
+        responseSerializer  = AFImageResponseSerializer() as AFImageResponseSerializer
+        super.init()
+    }
+    
+    // MARK: - Public Helpers
+    public typealias SuccessBlock = (()->())
+    
+    public func downloadMediaWithUrls(urls: NSSet, completion: SuccessBlock) {
+        let allUrls = urls.allObjects as? [NSURL]
+        if allUrls == nil {
+            return
+        }
+        
+        let missingUrls = allUrls!.filter { self.shouldDownloadImageWithURL($0) }
+        if missingUrls.count == 0 {
+            return
+        }
+        
+        for url in missingUrls {
+            downloadImageWithURL(url) { (NSError error, UIImage downloadedImage) -> () in
+                if error != nil || downloadedImage == nil {
+                    return
+                }
+                
+                self.resizeImageIfNeeded(downloadedImage!, maxImageWidth: self.maxImageWidth) {
+                    (UIImage resizedImage) -> () in
+                    self.mediaMap[url] = resizedImage
+                    completion()
+                }
+            }
+        }
+    }
+    
+    public func imagesForUrls(urls: [NSURL]) -> [NSURL: UIImage] {
+        var filtered = [NSURL: UIImage]()
+        
+        for (url, image) in mediaMap {
+            if contains(urls, url) {
+                filtered[url] = image
+            }
+        }
+        
+        return filtered
+    }
+    
+    
+    // MARK: - Networking Wrappers
+    private func downloadImageWithURL(url: NSURL, callback: ((NSError?, UIImage?) -> ())) {
+        let request                     = NSMutableURLRequest(URL: url)
+        request.HTTPShouldHandleCookies = false
+        request.addValue("image/*", forHTTPHeaderField: "Accept")
+        
+        let operation                   = AFHTTPRequestOperation(request: request)
+        operation.responseSerializer    = responseSerializer
+        operation.setCompletionBlockWithSuccess({
+            [weak self]
+            (AFHTTPRequestOperation operation, AnyObject responseObject) -> Void in
+            
+            if let unwrappedImage = responseObject as? UIImage {
+                callback(nil, unwrappedImage)
+            }
+            
+        }, failure: {
+            (AFHTTPRequestOperation operation, NSError error) -> Void in
+            callback(error, nil)
+        })
+        
+        downloadQueue.addOperation(operation)
+        retryMap[url] = retryCountForURL(url) + 1
+    }
+    
+    private func retryCountForURL(url: NSURL) -> Int {
+        return retryMap[url] ?? 0
+    }
+    
+    private func shouldDownloadImageWithURL(url: NSURL!) -> Bool {
+        // Download only if it's not cached, and if it's not being downloaded right now!
+        if url == nil || mediaMap[url] != nil {
+            return false
+        }
+        
+        if retryCountForURL(url) > maximumRetryCount {
+            return false
+        }
+        
+        for operation in downloadQueue.operations as [AFHTTPRequestOperation] {
+            if operation.request.URL.isEqual(url) {
+                return false
+            }
+        }
+        
+        return true
+    }    
+    
+    // MARK: - Async Image Resizing Helpers
+    private func resizeImageIfNeeded(image: UIImage, maxImageWidth: CGFloat, callback: ((UIImage) -> ())) {
+        if image.size.width <= maxImageWidth {
+            callback(image)
+            return
+        }
+        
+        // Calculate the target size + Process in BG!
+        var targetSize      = image.size
+        targetSize.height   = round(maxImageWidth * targetSize.height / targetSize.width)
+        targetSize.width    = maxImageWidth
+        
+        dispatch_async(resizeQueue, { () -> Void in
+            let resizedImage = image.imageCroppedToFitSize(targetSize, ignoreAlpha: false)
+            dispatch_async(dispatch_get_main_queue(), { () -> Void in
+                callback(resizedImage)
+            })
+        })
+    }
+    
+    // MARK: - Constants
+    private let maximumRetryCount:  Int = 3
+    
+    // MARK: - Private Properties
+    private let responseSerializer: AFHTTPResponseSerializer
+    private let downloadQueue:      NSOperationQueue
+    private let resizeQueue:        dispatch_queue_t
+    private var mediaMap:           [NSURL: UIImage]
+    private var retryMap:           [NSURL: Int]
+    private let maxImageWidth:      CGFloat
+}
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift
index 76aba8d77fc1..3594379b70fa 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockCommentTableViewCell.swift
@@ -32,7 +32,7 @@ import Foundation
     }
     public var site: String? {
         didSet {
-            btnSite.setTitle(site ?? String(), forState: .Normal)
+            siteLabel.text = site ?? String()
         }
     }
     public var isReplyEnabled: Bool = false {
@@ -99,8 +99,12 @@ import Foundation
         // Setup Labels
         nameLabel.font                      = WPStyleGuide.Notifications.blockBoldFont
         timestampLabel.font                 = WPStyleGuide.Notifications.blockRegularFont
-        btnSite.titleLabel!.font            = WPStyleGuide.Notifications.blockRegularFont
+        siteLabel.font                      = WPStyleGuide.Notifications.blockRegularFont
 
+        // Setup Recognizers
+        siteLabel.gestureRecognizers        = [ UITapGestureRecognizer(target: self, action: "siteWasPressed:") ]
+        siteLabel.userInteractionEnabled    = true
+        
         // Background
         approvalStatusView.backgroundColor  = WPStyleGuide.Notifications.blockUnapprovedBgColor
         approvalSidebarView.backgroundColor = WPStyleGuide.Notifications.blockUnapprovedSideColor
@@ -229,7 +233,7 @@ import Foundation
         separatorView.backgroundColor       = WPStyleGuide.Notifications.blockSeparatorColorForComment(isApproved: isCommentApproved)
         nameLabel.textColor                 = WPStyleGuide.Notifications.blockTextColorForComment(isApproved: isCommentApproved)
         timestampLabel.textColor            = WPStyleGuide.Notifications.blockTimestampColorForComment(isApproved: isCommentApproved)
-        btnSite.setTitleColor(WPStyleGuide.Notifications.blockTimestampColorForComment(isApproved: isCommentApproved), forState: .Normal)
+        siteLabel.textColor                 = WPStyleGuide.Notifications.blockTimestampColorForComment(isApproved: isCommentApproved)
         super.linkColor                     = WPStyleGuide.Notifications.blockLinkColorForComment(isApproved: isCommentApproved)
         super.attributedText                = isCommentApproved ? attributedCommentText : attributedCommentUnapprovedText
     }
@@ -267,8 +271,8 @@ import Foundation
     @IBOutlet private weak var gravatarImageView    : UIImageView!
     @IBOutlet private weak var nameLabel            : UILabel!
     @IBOutlet private weak var timestampLabel       : UILabel!
+    @IBOutlet private weak var siteLabel            : UILabel!
     @IBOutlet private weak var separatorView        : UIView!
-    @IBOutlet private weak var btnSite              : UIButton!
     @IBOutlet private weak var btnReply             : UIButton!
     @IBOutlet private weak var btnLike              : UIButton!
     @IBOutlet private weak var btnApprove           : UIButton!
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockImageTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockImageTableViewCell.swift
index 6359841c8497..a698111f9dbe 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockImageTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockImageTableViewCell.swift
@@ -35,9 +35,6 @@ import Foundation
         selectionStyle  = .None
     }
     
-    // MARK: - Private Methods
-
-    
     // MARK: - Private
     private var imageURL:               NSURL?
     
diff --git a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTextTableViewCell.swift b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTextTableViewCell.swift
index 724c3b777ed0..c090d6433d4a 100644
--- a/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTextTableViewCell.swift
+++ b/WordPress/Classes/ViewRelated/Notifications/Views/NoteBlockTextTableViewCell.swift
@@ -1,27 +1,23 @@
 import Foundation
 
 
-@objc public class NoteBlockTextTableViewCell : NoteBlockTableViewCell
+@objc public class NoteBlockTextTableViewCell : NoteBlockTableViewCell, RichTextViewDataSource, RichTextViewDelegate
 {
     // MARK: - Public Properties
     public var onUrlClick: ((NSURL) -> Void)?
     public var attributedText: NSAttributedString? {
         didSet {
-            textView.attributedText = attributedText ??  NSAttributedString()
+            textView.attributedText = attributedText
             setNeedsLayout()
         }
     }
+    
     public var isBadge: Bool = false {
         didSet {
-            if isBadge {
-                backgroundColor = WPStyleGuide.Notifications.badgeBackgroundColor
-                alignment       = .Center
-            } else {
-                backgroundColor = WPStyleGuide.Notifications.blockBackgroundColor
-                alignment       = .Left
-            }
+            backgroundColor = WPStyleGuide.Notifications.blockBackgroundColorForRichText(isBadge)
         }
     }
+    
     public var linkColor: UIColor? {
         didSet {
             if let unwrappedLinkColor = linkColor {
@@ -29,6 +25,7 @@ import Foundation
             }
         }
     }
+    
     public var dataDetectors: UIDataDetectorTypes? {
         didSet {
             if let unwrappedDataDetectors = dataDetectors {
@@ -36,94 +33,53 @@ import Foundation
             }
         }
     }
+    
     public var labelPadding: UIEdgeInsets {
         return privateLabelPadding
     }
-    public var isTextViewSelectable: Bool = false {
+    
+    public var isTextViewSelectable: Bool = true {
         didSet {
             textView.selectable = isTextViewSelectable
         }
     }
     
     
-    //  TODO:
-    //  Once NotificationDetailsViewController has been migrated to Swift, please, nuke this property, and make sure this class is fed
-    //  with an string already aligned. 
-    //  This is temporary workaround since WPStyleGuide+Notifications is swift only.
-    //
-    private var alignment : NSTextAlignment = .Left {
-        didSet {
-            if attributedText == nil {
-                return
-            }
-            
-            let unwrappedMutableString  = attributedText!.mutableCopy() as NSMutableAttributedString
-            let range                   = NSRange(location: 0, length: unwrappedMutableString.length)
-            let paragraph               = WPStyleGuide.Notifications.blockParagraphStyleWithAlignment(.Center)
-            unwrappedMutableString.addAttribute(NSParagraphStyleAttributeName, value: paragraph, range: range)
-            
-            attributedText = unwrappedMutableString
-        }
-    }
-    
     // MARK: - View Methods
     public override func awakeFromNib() {
         super.awakeFromNib()
                 
         backgroundColor             = WPStyleGuide.Notifications.blockBackgroundColor
         selectionStyle              = .None
-        textView.contentInset       = privateLabelInsets
+        
+        assert(textView != nil)
+        textView.contentInset       = UIEdgeInsetsZero
         textView.textContainerInset = UIEdgeInsetsZero
         textView.backgroundColor    = UIColor.clearColor()
         textView.editable           = false
-        textView.selectable         = false
+        textView.selectable         = true
         textView.dataDetectorTypes  = .None
+        textView.dataSource         = self
+        textView.delegate           = self
         
-        // Setup a Gestures Recognizer: This way we'll handle links!
-        gesturesRecognizer          = UITapGestureRecognizer()
-        gesturesRecognizer.addTarget(self, action: "handleTap:")
-        textView.gestureRecognizers  = [gesturesRecognizer]
+        textView.setTranslatesAutoresizingMaskIntoConstraints(false)
     }
     
     public override func layoutSubviews() {
         // Calculate the TextView's width, before hitting layoutSubviews!
         textView.preferredMaxLayoutWidth = min(bounds.width, maxWidth) - labelPadding.left - labelPadding.right
-        
         super.layoutSubviews()
     }
-    
-    
-    // MARK: - UITapGestureRecognizer Helpers
-    public func handleTap(recognizer: UITapGestureRecognizer) {
-
-        // Detect the location tapped
-        let textStorage = textView.textStorage
-        let layoutManager = textView.layoutManager
-        let textContainer = textView.textContainer
-        
-        let locationInTextView = recognizer.locationInView(textView)
-        let characterIndex = layoutManager.characterIndexForPoint(locationInTextView, inTextContainer: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
         
-        if characterIndex >= textStorage.length {
-            return
-        }
-        
-        // Load the NSURL instance, if any
-        let rawURL: AnyObject? = textView.textStorage.attribute(NSLinkAttributeName, atIndex: characterIndex, effectiveRange: nil)
-        if let unwrappedURL = rawURL as? NSURL {
-            onUrlClick?(unwrappedURL)
-        }
+    // MARK: - RichTextView Data Source
+    public func textView(textView: UITextView, didPressLink link: NSURL) {
+        onUrlClick?(link)
     }
     
-    
     // MARK: - Constants
     private let maxWidth            = WPTableViewFixedWidth
     private let privateLabelPadding = UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 12)
-    private let privateLabelInsets  = UIEdgeInsets(top: 1, left: -5, bottom: 0, right: 0)
-    
-    // MARK: - Private
-    private var gesturesRecognizer: UITapGestureRecognizer!
     
     // MARK: - IBOutlets
-    @IBOutlet private weak var textView: WPDynamicHeightTextView!
+    @IBOutlet private weak var textView: RichTextView!
 }
diff --git a/WordPress/Resources/InlineComposeView.xib b/WordPress/Resources/InlineComposeView.xib
deleted file mode 100644
index 1c70ed23ecb5..000000000000
--- a/WordPress/Resources/InlineComposeView.xib
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3733"/>
-    </dependencies>
-    <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="InlineComposeView">
-            <connections>
-                <outlet property="activityIndicatorView" destination="cTT-0u-hzI" id="6SG-iv-Eke"/>
-                <outlet property="inputAccessoryView" destination="xQf-WQ-fdT" id="W9x-Hn-KCP"/>
-                <outlet property="placeholderLabel" destination="X94-zo-flx" id="ryJ-AR-Fa9"/>
-                <outlet property="sendButton" destination="sqC-Nr-O7m" id="YRn-Z0-y4u"/>
-                <outlet property="toolbarTextView" destination="BZS-fj-e3Z" id="syK-e2-c2y"/>
-            </connections>
-        </placeholder>
-        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
-        <view contentMode="scaleToFill" id="xQf-WQ-fdT" userLabel="Composer" customClass="InlineComposeToolbarView">
-            <rect key="frame" x="0.0" y="0.0" width="554" height="44"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-            <subviews>
-                <view contentMode="scaleToFill" id="hBK-UR-24O" userLabel="WidthConstrainer">
-                    <rect key="frame" x="0.0" y="0.0" width="554" height="44"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                    <subviews>
-                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="BZS-fj-e3Z">
-                            <rect key="frame" x="5" y="6" width="491" height="33"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                            <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                            <connections>
-                                <outlet property="delegate" destination="-1" id="eYs-n0-Evf"/>
-                            </connections>
-                        </textView>
-                        <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Write a reply…" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X94-zo-flx">
-                            <rect key="frame" x="10" y="10" width="479" height="21"/>
-                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/>
-                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                            <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
-                            <nil key="highlightedColor"/>
-                        </label>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="sqC-Nr-O7m">
-                            <rect key="frame" x="503" y="5" width="44" height="36"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                            <state key="normal" title="Reply"/>
-                            <connections>
-                                <action selector="onSendReply:" destination="-1" eventType="touchUpInside" id="zXg-4M-nGP"/>
-                            </connections>
-                        </button>
-                        <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" id="cTT-0u-hzI">
-                            <rect key="frame" x="516" y="13" width="20" height="20"/>
-                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                        </activityIndicatorView>
-                    </subviews>
-                    <color key="backgroundColor" red="0.93072775139999997" green="0.93072775139999997" blue="0.93072775139999997" alpha="0.94999999999999996" colorSpace="calibratedRGB"/>
-                </view>
-            </subviews>
-            <connections>
-                <outlet property="composerContainerView" destination="hBK-UR-24O" id="GCy-Ru-HVH"/>
-            </connections>
-        </view>
-    </objects>
-</document>
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index b6b5327695c4..d24951c78416 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -259,9 +259,7 @@
 		ACBAB6860E1247F700F38795 /* PostPreviewViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACBAB6850E1247F700F38795 /* PostPreviewViewController.m */; };
 		ACC156CC0E10E67600D6E1A0 /* WPPostViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = ACC156CB0E10E67600D6E1A0 /* WPPostViewController.m */; };
 		ADF544C2195A0F620092213D /* CustomHighlightButton.m in Sources */ = {isa = PBXBuildFile; fileRef = ADF544C1195A0F620092213D /* CustomHighlightButton.m */; };
-		B5134AF519B2C4F200FADE8C /* ReplyBezierView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5134AF419B2C4F200FADE8C /* ReplyBezierView.swift */; };
 		B51D9A7E19634D4400CA857B /* Noticons-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = B55853F419630AF900FAF6C3 /* Noticons-Regular.otf */; };
-		B52B4F7A19C0E49B00526D6F /* WPDynamicHeightTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52B4F7919C0E49B00526D6F /* WPDynamicHeightTextView.swift */; };
 		B52C4C7D199D4CD3009FD823 /* NoteBlockUserTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52C4C7C199D4CD3009FD823 /* NoteBlockUserTableViewCell.swift */; };
 		B52C4C7F199D74AE009FD823 /* NoteTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B52C4C7E199D74AE009FD823 /* NoteTableViewCell.swift */; };
 		B532D4E9199D4357006E4DF6 /* NoteBlockCommentTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B532D4E5199D4357006E4DF6 /* NoteBlockCommentTableViewCell.swift */; };
@@ -271,6 +269,11 @@
 		B532D4EE199D4418006E4DF6 /* NoteBlockImageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B532D4ED199D4418006E4DF6 /* NoteBlockImageTableViewCell.swift */; };
 		B53FDF6D19B8C336000723B6 /* UIScreen+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B53FDF6C19B8C336000723B6 /* UIScreen+Helpers.swift */; };
 		B548458219A258890077E7A5 /* UIActionSheet+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = B548458119A258890077E7A5 /* UIActionSheet+Helpers.m */; };
+		B54866CA1A0D7042004AC79D /* NSAttributedString+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54866C91A0D7042004AC79D /* NSAttributedString+Helpers.swift */; };
+		B54E1DF01A0A7BAA00807537 /* ReplyBezierView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54E1DED1A0A7BAA00807537 /* ReplyBezierView.swift */; };
+		B54E1DF11A0A7BAA00807537 /* ReplyTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54E1DEE1A0A7BAA00807537 /* ReplyTextView.swift */; };
+		B54E1DF21A0A7BAA00807537 /* ReplyTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B54E1DEF1A0A7BAA00807537 /* ReplyTextView.xib */; };
+		B54E1DF41A0A7BBF00807537 /* NotificationMediaDownloader.swift in Sources */ = {isa = PBXBuildFile; fileRef = B54E1DF31A0A7BBF00807537 /* NotificationMediaDownloader.swift */; };
 		B5509A9319CA38B3006D2E49 /* EditReplyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5509A9219CA38B3006D2E49 /* EditReplyViewController.m */; };
 		B5509A9519CA3B9F006D2E49 /* EditReplyViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5509A9419CA3B9F006D2E49 /* EditReplyViewController.xib */; };
 		B55853F31962337500FAF6C3 /* NSScanner+Helpers.m in Sources */ = {isa = PBXBuildFile; fileRef = B55853F21962337500FAF6C3 /* NSScanner+Helpers.m */; };
@@ -298,9 +301,10 @@
 		B5CC05F61962150600975CAC /* Constants.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CC05F51962150600975CAC /* Constants.m */; };
 		B5CC05F91962186D00975CAC /* Meta.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CC05F81962186D00975CAC /* Meta.m */; };
 		B5CC05FC196218E100975CAC /* XMLParserCollecter.m in Sources */ = {isa = PBXBuildFile; fileRef = B5CC05FB196218E100975CAC /* XMLParserCollecter.m */; };
+		B5D7F2DC1A04180A006D3047 /* NSAttributedString+RichTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7F2D91A04180A006D3047 /* NSAttributedString+RichTextView.swift */; };
+		B5D7F2DD1A04180A006D3047 /* RichTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7F2DA1A04180A006D3047 /* RichTextView.swift */; };
+		B5D7F2DE1A04180A006D3047 /* UITextView+RichTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5D7F2DB1A04180A006D3047 /* UITextView+RichTextView.swift */; };
 		B5E167F419C08D18009535AA /* NSCalendar+Helpers.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E167F319C08D18009535AA /* NSCalendar+Helpers.swift */; };
-		B5E23BDC19AD0CED000D6879 /* ReplyTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B5E23BDA19AD0CED000D6879 /* ReplyTextView.swift */; };
-		B5E23BDD19AD0CED000D6879 /* ReplyTextView.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E23BDB19AD0CED000D6879 /* ReplyTextView.xib */; };
 		B5E23BDF19AD0D00000D6879 /* NoteTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B5E23BDE19AD0D00000D6879 /* NoteTableViewCell.xib */; };
 		B5F015CB195DFD7600F6ECF2 /* WordPressActivity.m in Sources */ = {isa = PBXBuildFile; fileRef = B5F015CA195DFD7600F6ECF2 /* WordPressActivity.m */; };
 		B5FD4543199D0F2800286FBB /* NotificationDetailsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = B5FD4540199D0F2800286FBB /* NotificationDetailsViewController.m */; };
@@ -314,7 +318,6 @@
 		CC24E5EF1577D1EA00A6D5B5 /* WPFriendFinderViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CC24E5EE1577D1EA00A6D5B5 /* WPFriendFinderViewController.m */; };
 		CC24E5F11577DBC300A6D5B5 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC24E5F01577DBC300A6D5B5 /* AddressBook.framework */; };
 		CC24E5F51577E16B00A6D5B5 /* Accounts.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC24E5F41577E16B00A6D5B5 /* Accounts.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		CC70165B185A7536007B37DB /* InlineComposeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = CC70165A185A7536007B37DB /* InlineComposeView.xib */; };
 		CCEF153114C9EA050001176D /* WPWebAppViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CCEF153014C9EA050001176D /* WPWebAppViewController.m */; };
 		CEBD3EAB0FF1BA3B00C1396E /* Blog.m in Sources */ = {isa = PBXBuildFile; fileRef = CEBD3EAA0FF1BA3B00C1396E /* Blog.m */; };
 		E100C6BB1741473000AE48D8 /* WordPress-11-12.xcmappingmodel in Sources */ = {isa = PBXBuildFile; fileRef = E100C6BA1741472F00AE48D8 /* WordPress-11-12.xcmappingmodel */; };
@@ -950,8 +953,6 @@
 		ADF544C1195A0F620092213D /* CustomHighlightButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomHighlightButton.m; sourceTree = "<group>"; };
 		AEFB66560B716519236CEE67 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "../Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
 		B43F6A7D9B3DC5B8B4A7DDCA /* Pods-WordPressTest.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressTest.debug.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressTest/Pods-WordPressTest.debug.xcconfig"; sourceTree = "<group>"; };
-		B5134AF419B2C4F200FADE8C /* ReplyBezierView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplyBezierView.swift; sourceTree = "<group>"; };
-		B52B4F7919C0E49B00526D6F /* WPDynamicHeightTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WPDynamicHeightTextView.swift; sourceTree = "<group>"; };
 		B52C4C7C199D4CD3009FD823 /* NoteBlockUserTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoteBlockUserTableViewCell.swift; sourceTree = "<group>"; };
 		B52C4C7E199D74AE009FD823 /* NoteTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoteTableViewCell.swift; sourceTree = "<group>"; };
 		B532D4E5199D4357006E4DF6 /* NoteBlockCommentTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoteBlockCommentTableViewCell.swift; sourceTree = "<group>"; };
@@ -962,6 +963,11 @@
 		B53FDF6C19B8C336000723B6 /* UIScreen+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIScreen+Helpers.swift"; sourceTree = "<group>"; };
 		B548458019A258890077E7A5 /* UIActionSheet+Helpers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIActionSheet+Helpers.h"; sourceTree = "<group>"; };
 		B548458119A258890077E7A5 /* UIActionSheet+Helpers.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIActionSheet+Helpers.m"; sourceTree = "<group>"; };
+		B54866C91A0D7042004AC79D /* NSAttributedString+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+Helpers.swift"; sourceTree = "<group>"; };
+		B54E1DED1A0A7BAA00807537 /* ReplyBezierView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplyBezierView.swift; sourceTree = "<group>"; };
+		B54E1DEE1A0A7BAA00807537 /* ReplyTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplyTextView.swift; sourceTree = "<group>"; };
+		B54E1DEF1A0A7BAA00807537 /* ReplyTextView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReplyTextView.xib; sourceTree = "<group>"; };
+		B54E1DF31A0A7BBF00807537 /* NotificationMediaDownloader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationMediaDownloader.swift; sourceTree = "<group>"; };
 		B5509A9119CA38B3006D2E49 /* EditReplyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditReplyViewController.h; sourceTree = "<group>"; };
 		B5509A9219CA38B3006D2E49 /* EditReplyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EditReplyViewController.m; sourceTree = "<group>"; };
 		B5509A9419CA3B9F006D2E49 /* EditReplyViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = EditReplyViewController.xib; path = Resources/EditReplyViewController.xib; sourceTree = "<group>"; };
@@ -998,9 +1004,10 @@
 		B5CC05F81962186D00975CAC /* Meta.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Meta.m; sourceTree = "<group>"; };
 		B5CC05FA196218E100975CAC /* XMLParserCollecter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMLParserCollecter.h; sourceTree = "<group>"; };
 		B5CC05FB196218E100975CAC /* XMLParserCollecter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMLParserCollecter.m; sourceTree = "<group>"; };
+		B5D7F2D91A04180A006D3047 /* NSAttributedString+RichTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+RichTextView.swift"; sourceTree = "<group>"; };
+		B5D7F2DA1A04180A006D3047 /* RichTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RichTextView.swift; sourceTree = "<group>"; };
+		B5D7F2DB1A04180A006D3047 /* UITextView+RichTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UITextView+RichTextView.swift"; sourceTree = "<group>"; };
 		B5E167F319C08D18009535AA /* NSCalendar+Helpers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NSCalendar+Helpers.swift"; sourceTree = "<group>"; };
-		B5E23BDA19AD0CED000D6879 /* ReplyTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ReplyTextView.swift; sourceTree = "<group>"; };
-		B5E23BDB19AD0CED000D6879 /* ReplyTextView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ReplyTextView.xib; sourceTree = "<group>"; };
 		B5E23BDE19AD0D00000D6879 /* NoteTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NoteTableViewCell.xib; sourceTree = "<group>"; };
 		B5F015C9195DFD7600F6ECF2 /* WordPressActivity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WordPressActivity.h; sourceTree = "<group>"; };
 		B5F015CA195DFD7600F6ECF2 /* WordPressActivity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WordPressActivity.m; sourceTree = "<group>"; };
@@ -1030,7 +1037,6 @@
 		CC24E5F01577DBC300A6D5B5 /* AddressBook.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
 		CC24E5F21577DFF400A6D5B5 /* Twitter.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; };
 		CC24E5F41577E16B00A6D5B5 /* Accounts.framework */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = wrapper.framework; name = Accounts.framework; path = System/Library/Frameworks/Accounts.framework; sourceTree = SDKROOT; };
-		CC70165A185A7536007B37DB /* InlineComposeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = InlineComposeView.xib; path = Resources/InlineComposeView.xib; sourceTree = "<group>"; };
 		CCEF152F14C9EA050001176D /* WPWebAppViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPWebAppViewController.h; sourceTree = "<group>"; };
 		CCEF153014C9EA050001176D /* WPWebAppViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPWebAppViewController.m; sourceTree = "<group>"; };
 		CEBD3EA90FF1BA3B00C1396E /* Blog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Blog.h; sourceTree = "<group>"; };
@@ -1997,7 +2003,6 @@
 				8525398A171761D9003F6B32 /* WPComLanguages.m */,
 				E183BD7217621D85000B0822 /* WPCookie.h */,
 				E183BD7317621D86000B0822 /* WPCookie.m */,
-				B52B4F7919C0E49B00526D6F /* WPDynamicHeightTextView.swift */,
 				E114D798153D85A800984182 /* WPError.h */,
 				E114D799153D85A800984182 /* WPError.m */,
 				5DA3EE0E192508F700294E0B /* WPImageOptimizer.h */,
@@ -2213,10 +2218,21 @@
 			path = Notifications;
 			sourceTree = "<group>";
 		};
+		B54E1DEC1A0A7BAA00807537 /* ReplyTextView */ = {
+			isa = PBXGroup;
+			children = (
+				B54E1DED1A0A7BAA00807537 /* ReplyBezierView.swift */,
+				B54E1DEE1A0A7BAA00807537 /* ReplyTextView.swift */,
+				B54E1DEF1A0A7BAA00807537 /* ReplyTextView.xib */,
+			);
+			path = ReplyTextView;
+			sourceTree = "<group>";
+		};
 		B587796C19B799D800E57C5A /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
 				B587798319B799EB00E57C5A /* Notifications */,
+				B5E167F319C08D18009535AA /* NSCalendar+Helpers.swift */,
 				B587796F19B799D800E57C5A /* NSDate+Helpers.swift */,
 				B587797019B799D800E57C5A /* NSIndexPath+Swift.swift */,
 				B587797119B799D800E57C5A /* NSParagraphStyle+Helpers.swift */,
@@ -2227,7 +2243,7 @@
 				B587797619B799D800E57C5A /* UITableViewCell+Helpers.swift */,
 				B587797719B799D800E57C5A /* UIView+Helpers.swift */,
 				B53FDF6C19B8C336000723B6 /* UIScreen+Helpers.swift */,
-				B5E167F319C08D18009535AA /* NSCalendar+Helpers.swift */,
+				B54866C91A0D7042004AC79D /* NSAttributedString+Helpers.swift */,
 			);
 			path = Extensions;
 			sourceTree = "<group>";
@@ -2250,12 +2266,20 @@
 			path = Style;
 			sourceTree = "<group>";
 		};
+		B5D7F2D81A04180A006D3047 /* RichTextView */ = {
+			isa = PBXGroup;
+			children = (
+				B5D7F2DA1A04180A006D3047 /* RichTextView.swift */,
+				B5D7F2D91A04180A006D3047 /* NSAttributedString+RichTextView.swift */,
+				B5D7F2DB1A04180A006D3047 /* UITextView+RichTextView.swift */,
+			);
+			path = RichTextView;
+			sourceTree = "<group>";
+		};
 		B5E23BD919AD0CED000D6879 /* Tools */ = {
 			isa = PBXGroup;
 			children = (
-				B5E23BDA19AD0CED000D6879 /* ReplyTextView.swift */,
-				B5E23BDB19AD0CED000D6879 /* ReplyTextView.xib */,
-				B5134AF419B2C4F200FADE8C /* ReplyBezierView.swift */,
+				B54E1DF31A0A7BBF00807537 /* NotificationMediaDownloader.swift */,
 			);
 			path = Tools;
 			sourceTree = "<group>";
@@ -2400,6 +2424,8 @@
 			isa = PBXGroup;
 			children = (
 				B5B56D2F19AFB68800B4E29B /* Style */,
+				B5D7F2D81A04180A006D3047 /* RichTextView */,
+				B54E1DEC1A0A7BAA00807537 /* ReplyTextView */,
 				B5E23BD919AD0CED000D6879 /* Tools */,
 				B5FD453E199D0F2800286FBB /* Controllers */,
 				B5FD4523199D0F1100286FBB /* Views */,
@@ -2595,7 +2621,6 @@
 				28AD735F0D9D9599002E5188 /* MainWindow.xib */,
 				30AF6CF413C2289600A29C00 /* AboutViewController.xib */,
 				3768BEF013041E7900E7C9A9 /* BetaFeedbackViewController.xib */,
-				CC70165A185A7536007B37DB /* InlineComposeView.xib */,
 				5DF94E311962B9D800359241 /* WPAlertView.xib */,
 				5DF94E321962B9D800359241 /* WPAlertViewSideBySide.xib */,
 			);
@@ -2877,12 +2902,12 @@
 				74C1C30E199170EA0077A7DC /* PostDetailViewController~ipad.xib in Resources */,
 				8370D10C11FA4A1B009D650F /* WPTableViewActivityCell.xib in Resources */,
 				8370D1BE11FA6295009D650F /* AddSiteViewController.xib in Resources */,
-				B5E23BDD19AD0CED000D6879 /* ReplyTextView.xib in Resources */,
 				8333FE0E11FF6EF200A495C1 /* EditSiteViewController.xib in Resources */,
 				74C1C306199170930077A7DC /* PostDetailViewController.xib in Resources */,
 				5DF94E331962B9D800359241 /* WPAlertView.xib in Resources */,
 				8362C1041201E7CE00599347 /* WebSignupViewController-iPad.xib in Resources */,
 				83CAD4211235F9F4003DFA20 /* MediaObjectView.xib in Resources */,
+				B54E1DF21A0A7BAA00807537 /* ReplyTextView.xib in Resources */,
 				3768BEF213041E7900E7C9A9 /* BetaFeedbackViewController.xib in Resources */,
 				313AE4A319E3F20400AAFABE /* CommentTableViewHeaderCell.xib in Resources */,
 				E1D91456134A853D0089019C /* Localizable.strings in Resources */,
@@ -2898,7 +2923,6 @@
 				85ED988817DFA00000090D0B /* Images.xcassets in Resources */,
 				5DC02A3818E4C5BD009A1765 /* ThemeDetailsViewController.xib in Resources */,
 				313AE4A219E3F20400AAFABE /* CommentTableViewCell.xib in Resources */,
-				CC70165B185A7536007B37DB /* InlineComposeView.xib in Resources */,
 				3716E401167296D30035F8C4 /* ToastView.xib in Resources */,
 				5DA5BF3E18E32DCF005F11F9 /* EditMediaViewController.xib in Resources */,
 				B5509A9519CA3B9F006D2E49 /* EditReplyViewController.xib in Resources */,
@@ -3191,6 +3215,7 @@
 				834CAE7C122D528A003DDF49 /* UIImage+Resize.m in Sources */,
 				5D9B17C519998A430047A4A2 /* ReaderBlockedTableViewCell.m in Sources */,
 				834CAE9F122D56B1003DDF49 /* UIImage+Alpha.m in Sources */,
+				B54866CA1A0D7042004AC79D /* NSAttributedString+Helpers.swift in Sources */,
 				834CAEA0122D56B1003DDF49 /* UIImage+RoundedCorner.m in Sources */,
 				E18EE95119349EC300B0A40C /* ReaderTopicServiceRemote.m in Sources */,
 				B5FD4544199D0F2800286FBB /* NotificationsViewController.m in Sources */,
@@ -3202,6 +3227,7 @@
 				E1B4A9E112FC8B1000EB3F67 /* EGORefreshTableHeaderView.m in Sources */,
 				5DF94E521962BAEB00359241 /* ReaderPostRichContentView.m in Sources */,
 				5DA3EE12192508F700294E0B /* WPImageOptimizer.m in Sources */,
+				B5D7F2DE1A04180A006D3047 /* UITextView+RichTextView.swift in Sources */,
 				E1D458691309589C00BF0235 /* Coordinate.m in Sources */,
 				375D090D133B94C3000CC9CD /* BlogsTableViewCell.m in Sources */,
 				859CFD46190E3198005FB217 /* WPMediaUploader.m in Sources */,
@@ -3240,9 +3266,9 @@
 				5DEB61B8156FCD5200242C35 /* WPChromelessWebViewController.m in Sources */,
 				CC24E5EF1577D1EA00A6D5B5 /* WPFriendFinderViewController.m in Sources */,
 				5903AE1B19B60A98009D5354 /* WPButtonForNavigationBar.m in Sources */,
-				B52B4F7A19C0E49B00526D6F /* WPDynamicHeightTextView.swift in Sources */,
 				E1AB07AD1578D34300D6AD64 /* SettingsViewController.m in Sources */,
 				E13EB7A5157D230000885780 /* WordPressComApi.m in Sources */,
+				B5D7F2DC1A04180A006D3047 /* NSAttributedString+RichTextView.swift in Sources */,
 				5D5D0027187DA9D30027CEF6 /* CategoriesViewController.m in Sources */,
 				5DF7389A1965FB3C00393584 /* WPTableViewHandler.m in Sources */,
 				E1E4CE0B1773C59B00430844 /* WPAvatarSource.m in Sources */,
@@ -3259,7 +3285,6 @@
 				5D44EB351986D695008B7175 /* ReaderSiteServiceRemote.m in Sources */,
 				5DA5BF4318E32DCF005F11F9 /* MediaSearchFilterHeaderView.m in Sources */,
 				5DF94E441962BAA700359241 /* WPContentView.m in Sources */,
-				B5E23BDC19AD0CED000D6879 /* ReplyTextView.swift in Sources */,
 				5DB4683B18A2E718004A89A9 /* LocationService.m in Sources */,
 				93740DCB17D8F86700C41B2F /* WPAlertView.m in Sources */,
 				E1D04D7E19374CFE002FADD7 /* BlogServiceRemoteXMLRPC.m in Sources */,
@@ -3319,6 +3344,7 @@
 				5DAE40AD19EC70930011A0AE /* ReaderPostHeaderView.m in Sources */,
 				74BB6F1A19AE7B9400FB7829 /* WPLegacyEditPageViewController.m in Sources */,
 				85B6F7521742DAE800CE7F3A /* WPNUXBackButton.m in Sources */,
+				B54E1DF01A0A7BAA00807537 /* ReplyBezierView.swift in Sources */,
 				5DF738941965FAB900393584 /* SubscribedTopicsViewController.m in Sources */,
 				E2E7EB46185FB140004F5E72 /* WPBlogSelectorButton.m in Sources */,
 				E183BD7417621D87000B0822 /* WPCookie.m in Sources */,
@@ -3328,6 +3354,7 @@
 				5DBCD9D518F35D7500B32229 /* ReaderTopicService.m in Sources */,
 				5D42A3DF175E7452005CFF05 /* AbstractPost.m in Sources */,
 				5D42A3E0175E7452005CFF05 /* BasePost.m in Sources */,
+				B5D7F2DD1A04180A006D3047 /* RichTextView.swift in Sources */,
 				E1249B4319408C910035E895 /* RemoteComment.m in Sources */,
 				93DEB88219E5BF7100F9546D /* TodayExtensionService.m in Sources */,
 				5D42A3E2175E7452005CFF05 /* ReaderPost.m in Sources */,
@@ -3340,7 +3367,7 @@
 				85D2275918F1EB8A001DA8DA /* WPAnalyticsTrackerMixpanel.m in Sources */,
 				E149D64F19349E69006A843D /* AccountServiceRemoteXMLRPC.m in Sources */,
 				E1DF5DFE19E7CFAE004E70D5 /* CategoryServiceRemoteXMLRPC.m in Sources */,
-				B5134AF519B2C4F200FADE8C /* ReplyBezierView.swift in Sources */,
+				B54E1DF11A0A7BAA00807537 /* ReplyTextView.swift in Sources */,
 				5DF94E461962BAA700359241 /* WPRichTextView.m in Sources */,
 				5D42A3FB175E75EE005CFF05 /* ReaderPostDetailViewController.m in Sources */,
 				E18EE94E19349EBA00B0A40C /* BlogServiceRemote.m in Sources */,
@@ -3363,6 +3390,7 @@
 				FF3DD6BE19F2B6B3003A52CB /* RemoteMedia.m in Sources */,
 				B5FD4543199D0F2800286FBB /* NotificationDetailsViewController.m in Sources */,
 				74D5FFD619ACDF6700389E8F /* WPLegacyEditPostViewController.m in Sources */,
+				B54E1DF41A0A7BBF00807537 /* NotificationMediaDownloader.swift in Sources */,
 				E174F6E6172A73960004F23A /* WPAccount.m in Sources */,
 				E100C6BB1741473000AE48D8 /* WordPress-11-12.xcmappingmodel in Sources */,
 				E1A03EE217422DCF0085D192 /* BlogToAccount.m in Sources */,