diff --git a/WordPress/Classes/Extensions/Array.swift b/WordPress/Classes/Extensions/Array.swift
index 74e7a1764113..cef35e0d8d55 100644
--- a/WordPress/Classes/Extensions/Array.swift
+++ b/WordPress/Classes/Extensions/Array.swift
@@ -12,4 +12,10 @@ extension Array {
             }
         }
     }
+
+    /// Safely returns an index from an array.
+    ///
+    subscript(safe index: Int) -> Element? {
+        return index >= 0 && index < count ? self[index] : nil
+    }
 }
diff --git a/WordPress/Classes/ViewRelated/Reader/Reader.storyboard b/WordPress/Classes/ViewRelated/Reader/Reader.storyboard
index 8fc796481354..f8302a237956 100644
--- a/WordPress/Classes/ViewRelated/Reader/Reader.storyboard
+++ b/WordPress/Classes/ViewRelated/Reader/Reader.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -18,11 +19,11 @@
                         <viewControllerLayoutGuide type="bottom" id="icf-FG-h6u"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="nFH-eq-cvg">
-                        <rect key="frame" x="0.0" y="64" width="375" height="495"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="483"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n2H-rP-0mh">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="495"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="483"/>
                                 <connections>
                                     <segue destination="ojY-lw-Nq8" kind="embed" id="HkI-vX-JZt"/>
                                 </connections>
@@ -55,7 +56,7 @@
                         <viewControllerLayoutGuide type="bottom" id="zkd-Io-waS"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" id="dbo-c9-92a">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textView clipsSubviews="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" editable="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="Ix7-KK-iap" customClass="WPRichContentView" customModule="WordPress" customModuleProvider="target">
@@ -232,14 +233,14 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" text="Attribution" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I5s-ci-UB0">
-                                                        <rect key="frame" x="28" y="0.0" width="81" height="20.5"/>
+                                                        <rect key="frame" x="28" y="0.0" width="0.0" height="20.5"/>
                                                         <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                         <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                     <view alpha="0.0" contentMode="scaleToFill" horizontalHuggingPriority="1" verticalHuggingPriority="1" horizontalCompressionResistancePriority="1" verticalCompressionResistancePriority="1" translatesAutoresizingMaskIntoConstraints="NO" id="YBQ-xA-5CN" userLabel="View (spacer)">
-                                                        <rect key="frame" x="117" y="0.0" width="228" height="0.0"/>
+                                                        <rect key="frame" x="-14" y="0.0" width="0.0" height="0.0"/>
                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     </view>
                                                 </subviews>
@@ -393,14 +394,14 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="B6J-Lg-PdX">
-                                <rect key="frame" x="0.0" y="20" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="56"/>
                                 <textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" enablesReturnKeyAutomatically="YES"/>
                                 <connections>
                                     <outlet property="delegate" destination="e0f-8T-Sz8" id="8aD-d4-C9q"/>
                                 </connections>
                             </searchBar>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="49S-3J-OMN">
-                                <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                                <rect key="frame" x="0.0" y="76" width="375" height="591"/>
                                 <connections>
                                     <segue destination="FBk-BW-Oyk" kind="embed" id="BIm-m7-JCp"/>
                                 </connections>
@@ -442,12 +443,20 @@
             </objects>
             <point key="canvasLocation" x="687" y="1811"/>
         </scene>
+        <!--Gallery Page View Controller-->
+        <scene sceneID="zqw-de-bzF">
+            <objects>
+                <pageViewController storyboardIdentifier="GalleryPageViewController" autoresizesArchivedViewToFullSize="NO" modalTransitionStyle="crossDissolve" transitionStyle="scroll" navigationOrientation="horizontal" spineLocation="none" id="M0F-5q-ILH" customClass="WPGalleryPageViewController" customModule="WordPress" customModuleProvider="target" sceneMemberID="viewController"/>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="XvH-cK-eCg" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="678" y="2520"/>
+        </scene>
         <!--Table View Controller-->
         <scene sceneID="Xc2-1X-rOR">
             <objects>
                 <tableViewController id="ojY-lw-Nq8" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="8GD-qV-397">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="495"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="483"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
@@ -473,24 +482,24 @@
                         <viewControllerLayoutGuide type="bottom" id="4Hq-9j-ssQ"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="3Jv-hf-pib">
-                        <rect key="frame" x="0.0" y="64" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <searchBar contentMode="redraw" translatesAutoresizingMaskIntoConstraints="NO" id="UQY-Uf-csX">
-                                <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="56"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="search" enablesReturnKeyAutomatically="YES"/>
                                 <connections>
                                     <outlet property="delegate" destination="sKI-JH-RAG" id="fsR-5r-2Md"/>
                                 </connections>
                             </searchBar>
                             <containerView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PuG-YC-OIC">
-                                <rect key="frame" x="0.0" y="44" width="375" height="559"/>
+                                <rect key="frame" x="0.0" y="56" width="375" height="547"/>
                                 <connections>
                                     <segue destination="His-O5-Cy6" kind="embed" id="xfh-l2-pdU"/>
                                 </connections>
                             </containerView>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What would you like to find?" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="afc-5c-5tF">
-                                <rect key="frame" x="16" y="246" width="343" height="27"/>
+                                <rect key="frame" x="16" y="252" width="343" height="27"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="22"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -596,7 +605,7 @@
             <objects>
                 <tableViewController id="FBk-BW-Oyk" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" layoutMarginsFollowReadableWidth="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="54" sectionHeaderHeight="18" sectionFooterHeight="18" id="q5P-P8-r6d">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="603"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="591"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <connections>
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift b/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
index d167b478adb9..198820f109e4 100644
--- a/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
+++ b/WordPress/Classes/ViewRelated/Reader/ReaderDetailViewController.swift
@@ -1076,6 +1076,16 @@ extension ReaderDetailViewController: WPRichContentViewDelegate {
 
         present(controller, animated: true, completion: nil)
     }
+
+    func richContentView(_ richContentView: WPRichContentView, didReceiveGalleryAction image: [WPTextAttachment], indexTapped index: Int) {
+
+        let galleryVC = WPGalleryPageViewController.controllerWithImages(with: image, selectedIndex: index)
+
+        galleryVC.modalTransitionStyle = .crossDissolve
+        galleryVC.modalPresentationStyle = .fullScreen
+
+        present(galleryVC, animated: true, completion: nil)
+    }
 }
 
 
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.swift b/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.swift
new file mode 100644
index 000000000000..15a7dbd97c86
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.swift
@@ -0,0 +1,8 @@
+import UIKit
+
+class ReaderGalleryCell: UICollectionViewCell {
+
+    @IBOutlet weak var galleryImageView: UIImageView!
+    @IBOutlet weak var loadingIndicator: UIActivityIndicatorView!
+
+}
diff --git a/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.xib b/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.xib
new file mode 100644
index 000000000000..98ee2afa4175
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Reader/ReaderGalleryCell.xib
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="ReaderGalleryCell" customModule="WordPress" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="251" height="211"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="251" height="211"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Ajo-bT-AZE">
+                        <rect key="frame" x="0.0" y="0.0" width="251" height="211"/>
+                    </imageView>
+                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="cAa-GN-Pga">
+                        <rect key="frame" x="115" y="95" width="20" height="20"/>
+                    </activityIndicatorView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstItem="Ajo-bT-AZE" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="1UW-mN-bJP"/>
+                <constraint firstItem="cAa-GN-Pga" firstAttribute="centerX" secondItem="gTV-IL-0wX" secondAttribute="centerX" id="78G-L0-ECS"/>
+                <constraint firstAttribute="bottom" secondItem="Ajo-bT-AZE" secondAttribute="bottom" id="B4f-2v-67f"/>
+                <constraint firstItem="Ajo-bT-AZE" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="UPS-xN-kZ3"/>
+                <constraint firstItem="cAa-GN-Pga" firstAttribute="centerY" secondItem="gTV-IL-0wX" secondAttribute="centerY" id="qBz-yF-5zI"/>
+                <constraint firstAttribute="trailing" secondItem="Ajo-bT-AZE" secondAttribute="trailing" id="sJw-gb-Bah"/>
+            </constraints>
+            <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
+            <size key="customSize" width="251" height="211"/>
+            <connections>
+                <outlet property="galleryImageView" destination="Ajo-bT-AZE" id="COb-J9-HCW"/>
+                <outlet property="loadingIndicator" destination="cAa-GN-Pga" id="urp-z1-VwJ"/>
+            </connections>
+            <point key="canvasLocation" x="31" y="-8"/>
+        </collectionViewCell>
+    </objects>
+</document>
diff --git a/WordPress/Classes/ViewRelated/Reader/WPGalleryPageViewController.swift b/WordPress/Classes/ViewRelated/Reader/WPGalleryPageViewController.swift
new file mode 100644
index 000000000000..4db6717d7354
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Reader/WPGalleryPageViewController.swift
@@ -0,0 +1,131 @@
+import UIKit
+
+class WPGalleryPageViewController: UIPageViewController {
+
+    // MARK: - Properties
+    let largeImageKey = "data-large-file"
+    var images = [WPTextAttachment]()
+    var initialIndex = 0
+    var currentVC: WPImageViewController?
+    var imageViewControllers = [WPImageViewController: Int]()
+
+    // MARK: - Convenience Factories
+
+
+    /// Convenience method for instantiating an instance of WPGalleryPageViewController
+    /// for a particular topic.
+    ///
+    /// - Parameters:
+    ///     - images:  Array of images to be displayed.
+    ///     - selectedIndex: Index of image selected by user
+    ///
+    /// - Return: A WPGalleryPageViewController instance.
+    ///
+    open class func controllerWithImages(with images: [WPTextAttachment], selectedIndex: Int) -> WPGalleryPageViewController {
+
+        let storyboard = UIStoryboard(name: "Reader", bundle: Bundle.main)
+        let controller = storyboard.instantiateViewController(withIdentifier: "GalleryPageViewController") as! WPGalleryPageViewController
+
+        controller.images = images
+        controller.initialIndex = selectedIndex
+
+        return controller
+    }
+
+    // MARK: - Lifecycle Methods
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        view.backgroundColor = .black
+
+        if let initialVC = imageViewControllerFor(index: initialIndex) {
+            setViewControllers([initialVC], direction: .forward, animated: true, completion: nil)
+            currentVC = initialVC
+        }
+
+        dataSource = self
+        delegate = self
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+
+        /// Clear out uneeded view controllers to save memory
+        ///
+        if let currentVC = currentVC, let index = imageViewControllers[currentVC] {
+                imageViewControllers.removeAll()
+                imageViewControllers[currentVC] = index
+        }
+    }
+
+    func imageViewControllerFor(index: Int) -> WPImageViewController? {
+
+        guard index >= 0, let imageAttachment = images[safe: index] else {
+            return nil
+        }
+
+        let urlString = imageAttachment.attributes?[largeImageKey] ?? imageAttachment.src
+
+        guard let url = URL(string: urlString) else {
+            return nil
+        }
+
+
+        //Check if we already have one
+        let previouslyInitializedViewController = imageViewControllers.first(where: { $0.value == index})?.key
+
+        if let vc = previouslyInitializedViewController {
+            return vc
+        }
+
+        if WPImageViewController.isUrlSupported(url), let vc = WPImageViewController(url: url) {
+
+            imageViewControllers[vc] = index
+            return vc
+        }
+
+        return nil
+    }
+
+}
+
+extension WPGalleryPageViewController: UIPageViewControllerDataSource {
+
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerAfter viewController: UIViewController) -> UIViewController? {
+
+        guard let imageVC = viewController  as? WPImageViewController else {
+            return nil
+        }
+
+        guard let index = imageViewControllers[imageVC] else {
+            return nil
+        }
+
+        return imageViewControllerFor(index: index + 1)
+    }
+
+    func pageViewController(_ pageViewController: UIPageViewController, viewControllerBefore viewController: UIViewController) -> UIViewController? {
+
+        guard let imageVC = viewController  as? WPImageViewController else {
+            return nil
+        }
+
+        guard let index = imageViewControllers[imageVC] else {
+            return nil
+        }
+
+        return imageViewControllerFor(index: index - 1)
+    }
+
+}
+
+extension WPGalleryPageViewController: UIPageViewControllerDelegate {
+
+    func pageViewController(_ pageViewController: UIPageViewController, didFinishAnimating finished: Bool, previousViewControllers: [UIViewController], transitionCompleted completed: Bool) {
+
+        if finished, let currentVC = previousViewControllers.first as? WPImageViewController {
+            self.currentVC =  currentVC
+        }
+    }
+}
diff --git a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h
index 835fdfbf18fb..04432141cdb1 100644
--- a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h
+++ b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.h
@@ -11,6 +11,7 @@
 - (instancetype)initWithImage:(UIImage *)image andURL:(NSURL *)url;
 - (instancetype)initWithImage:(UIImage *)image andMedia:(Media *)media;
 
+
 - (void)loadImage;
 - (void)hideBars:(BOOL)hide animated:(BOOL)animated;
 - (void)centerImage;
diff --git a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m
index 1bfee426544e..35214d617fe2 100644
--- a/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m
+++ b/WordPress/Classes/ViewRelated/Reader/WPImageViewController.m
@@ -101,7 +101,7 @@ - (void)viewDidLoad
     [tgr1 setNumberOfTapsRequired:1];
     [tgr1 requireGestureRecognizerToFail:tgr2];
     [self.scrollView addGestureRecognizer:tgr1];
-
+    
     self.flingableViewHandler = [[FlingableViewHandler alloc] initWithTargetView:self.scrollView];
     self.flingableViewHandler.delegate = self;
 
diff --git a/WordPress/Classes/ViewRelated/System/FlingableViewHandler.swift b/WordPress/Classes/ViewRelated/System/FlingableViewHandler.swift
index 850d8b7ab62d..20a9995ddc9e 100644
--- a/WordPress/Classes/ViewRelated/System/FlingableViewHandler.swift
+++ b/WordPress/Classes/ViewRelated/System/FlingableViewHandler.swift
@@ -44,11 +44,30 @@ class FlingableViewHandler: NSObject {
 
         super.init()
 
+        let leftSwipe = UISwipeGestureRecognizer(target: self, action: #selector(handleSwipeGesture(_:)))
+        leftSwipe.direction = .left
+        targetView.addGestureRecognizer(leftSwipe)
+
+        let rightSwipe = UISwipeGestureRecognizer(target: self, action: #selector(handleSwipeGesture(_:)))
+        rightSwipe.direction = .right
+        targetView.addGestureRecognizer(rightSwipe)
+
         panGestureRecognizer = UIPanGestureRecognizer(target: self, action: #selector(handlePanGesture(_:)))
+
+        //Allow swipe gestures to pass through first
+        panGestureRecognizer.require(toFail: leftSwipe)
+        panGestureRecognizer.require(toFail: rightSwipe)
+
         targetView.addGestureRecognizer(panGestureRecognizer)
         isActive = true
     }
 
+    @objc
+    fileprivate func handleSwipeGesture(_ recognizer: UISwipeGestureRecognizer) {
+
+        isActive = false
+    }
+
     @objc
     fileprivate func handlePanGesture(_ recognizer: UIPanGestureRecognizer) {
         guard isActive else { return }
diff --git a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift
index 667afa04a617..cb4ad77c5ad0 100644
--- a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift
+++ b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichContentView.swift
@@ -5,6 +5,7 @@ import WordPressShared
 
 @objc protocol WPRichContentViewDelegate: UITextViewDelegate {
     func richContentView(_ richContentView: WPRichContentView, didReceiveImageAction image: WPRichTextImage)
+    func richContentView(_ richContentView: WPRichContentView, didReceiveGalleryAction image: [WPTextAttachment], indexTapped index: Int)
     @objc optional func richContentViewShouldUpdateLayoutForAttachments(_ richContentView: WPRichContentView) -> Bool
     @objc optional func richContentViewDidUpdateLayoutForAttachments(_ richContentView: WPRichContentView)
 }
@@ -18,6 +19,7 @@ class WPRichContentView: UITextView {
         static let photonQuality = 65
         static let textContainerInset = UIEdgeInsetsMake(0.0, 0.0, 16.0, 0.0)
         static let defaultAttachmentHeight = CGFloat(50.0)
+        static let defaultGalleryHeight = CGFloat(280.0)
     }
 
     /// Used to keep references to image attachments.
@@ -205,9 +207,10 @@ class WPRichContentView: UITextView {
 
 extension WPRichContentView: WPTextAttachmentManagerDelegate {
     func attachmentManager(_ attachmentManager: WPTextAttachmentManager, viewForAttachment attachment: WPTextAttachment) -> UIView? {
-        if attachment.tagName == "img" {
+        if attachment.tagName == "gallery" {
+            return galleryForAttachment(attachment)
+        } else if attachment.tagName == "img" {
             return imageForAttachment(attachment)
-
         } else {
             return embedForAttachment(attachment)
         }
@@ -283,6 +286,48 @@ extension WPRichContentView: WPTextAttachmentManagerDelegate {
         return img
     }
 
+    func galleryForAttachment(_ attachment: WPTextAttachment) -> WPRichTextGallery {
+
+        let width: CGFloat = attachment.width > 0 ? attachment.width : self.bounds.width
+        let height: CGFloat = Constants.defaultGalleryHeight
+
+        let gallery = WPRichTextGallery(frame: CGRect(x: 0.0, y: 0.0, width: width, height: height))
+
+        attachment.maxSize = CGSize(width: width, height: height)
+
+        gallery.handleGalleryTapped = handleGalleryTapped
+        gallery.isPrivate = isPrivate
+
+        if let htmlString = attachment.html, htmlString.count > 0 {
+
+            var content = htmlString
+
+            //remove gallery tags
+            let galleryTagsStart = try! NSRegularExpression(pattern: "<gallery[^>]*>", options: .caseInsensitive)
+            let galleryTagsEnd = try! NSRegularExpression(pattern: "</gallery>", options: .caseInsensitive)
+
+            content = galleryTagsStart.stringByReplacingMatches(in: content,
+                                                                options: .reportCompletion,
+                                                                range: NSRange(location: 0, length: content.count),
+                                                                withTemplate: "")
+
+            content = galleryTagsEnd.stringByReplacingMatches(in: content,
+                                                                options: .reportCompletion,
+                                                                range: NSRange(location: 0, length: content.count),
+                                                                withTemplate: "")
+
+            //get images as their own attachments, to become datasource
+            let formatter = WPRichTextFormatter()
+            let (_, attachments) = formatter.processAndExtractTags(content)
+
+            gallery.imageAttachments = attachments.filter({ (attachment) -> Bool in
+                    return attachment.tagName == "img"
+            })
+        }
+
+        return gallery
+    }
+
 
     /// Retrieves the URL for a link wrapping a text attachment, if one exists.
     ///
@@ -362,8 +407,18 @@ extension WPRichContentView: WPTextAttachmentManagerDelegate {
         guard let richDelegate = delegate as? WPRichContentViewDelegate else {
             return
         }
+
         richDelegate.richContentView(self, didReceiveImageAction: sender)
     }
+
+    func handleGalleryTapped(selectedIndex: Int, galleryImages: [WPTextAttachment]) {
+
+        guard let richDelegate = delegate as? WPRichContentViewDelegate else {
+            return
+        }
+
+        richDelegate.richContentView(self, didReceiveGalleryAction: galleryImages, indexTapped: selectedIndex)
+    }
 }
 
 
diff --git a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextFormatter.swift b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextFormatter.swift
index 62cbd18569bd..765653666f95 100644
--- a/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextFormatter.swift
+++ b/WordPress/Classes/ViewRelated/Views/WPRichText/WPRichTextFormatter.swift
@@ -27,6 +27,7 @@ class WPRichTextFormatter {
             AttachmentTagProcessor(tagName: "video", includesEndTag: true),
             AttachmentTagProcessor(tagName: "audio", includesEndTag: true),
             AttachmentTagProcessor(tagName: "embed", includesEndTag: false),
+            AttachmentTagProcessor(tagName: "gallery", includesEndTag: true)
         ]
     }()
 
@@ -95,7 +96,7 @@ class WPRichTextFormatter {
 
         let str = attrString.string
         let regex = try! NSRegularExpression(pattern: HRTagProcessor.horizontalRuleIdentifier, options: .caseInsensitive)
-        let matches = regex.matches(in: str, options: NSRegularExpression.MatchingOptions.reportCompletion, range: NSMakeRange(0, str.characters.count))
+        let matches = regex.matches(in: str, options: NSRegularExpression.MatchingOptions.reportCompletion, range: NSMakeRange(0, str.count))
 
         for match: NSTextCheckingResult in matches.reversed() {
             let range = match.range
@@ -140,7 +141,7 @@ class WPRichTextFormatter {
 
         let str = attrString.string
         let regex = try! NSRegularExpression(pattern: type(of: self).blockquoteIdentifier, options: .caseInsensitive)
-        let matches = regex.matches(in: str, options: NSRegularExpression.MatchingOptions.reportCompletion, range: NSMakeRange(0, str.characters.count))
+        let matches = regex.matches(in: str, options: NSRegularExpression.MatchingOptions.reportCompletion, range: NSMakeRange(0, str.count))
 
         for match: NSTextCheckingResult in matches.reversed() {
 
@@ -180,7 +181,7 @@ class WPRichTextFormatter {
     func processAndExtractTags(_ string: String) -> ParsedSource {
         var attachments = [WPTextAttachment]()
 
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return (string, attachments)
         }
 
@@ -291,7 +292,7 @@ class HtmlTagProcessor {
             parsedString += endTag
 
             // Advance the scanner to account for the closing tag.
-            scanner.scanLocation += endTag.characters.count
+            scanner.scanLocation += endTag.count
         }
 
         return (success, parsedString)
@@ -337,7 +338,7 @@ class BlockquoteTagProcessor: HtmlTagProcessor {
         // the tag.
         if !parsedString.contains("<p>") {
             var str = parsedString as NSString
-            let location = "<\(tagName)>".characters.count
+            let location = "<\(tagName)>".count
             str = str.replacingCharacters(in: NSRange(location: location, length: 0), with: WPRichTextFormatter.blockquoteIdentifier) as NSString
             parsedString = str as String
             return (parsedString, nil)
diff --git a/WordPress/Classes/ViewRelated/Views/WPRichText/WPTextAttachmentManager.swift b/WordPress/Classes/ViewRelated/Views/WPRichText/WPTextAttachmentManager.swift
index 6bfb8bfa9b69..7e44c700cf45 100644
--- a/WordPress/Classes/ViewRelated/Views/WPRichText/WPTextAttachmentManager.swift
+++ b/WordPress/Classes/ViewRelated/Views/WPRichText/WPTextAttachmentManager.swift
@@ -63,6 +63,7 @@ import UIKit
                 guard let attachment = object as? WPTextAttachment else {
                     return
                 }
+
                 self.layoutAttachmentViewForAttachment(attachment, atRange: range)
         })
     }
diff --git a/WordPress/Classes/ViewRelated/Views/WPRichTextGallery.swift b/WordPress/Classes/ViewRelated/Views/WPRichTextGallery.swift
new file mode 100644
index 000000000000..d56e90e20fd1
--- /dev/null
+++ b/WordPress/Classes/ViewRelated/Views/WPRichTextGallery.swift
@@ -0,0 +1,340 @@
+import UIKit
+import WordPressShared
+
+class WPRichTextGallery: UIView, WPRichTextMediaAttachment {
+
+    /// MARK - Constants
+    ///
+
+    fileprivate let galleryCellIdentifier = "ReaderGalleryCell"
+    fileprivate let contentUrlKey = "contentUrl"
+    fileprivate let linkUrlKey = "linkUrl"
+    fileprivate let viewHeightKey = "viewHeight"
+
+    fileprivate var viewHeight: CGFloat
+
+    var isPrivate = false
+    var contentURL: URL?
+    var linkURL: URL?
+
+    /// Default cell size, will be recalculated as page is laid out
+    ///
+    var cellWidth: CGFloat = 1.0
+    let cellPadding: CGFloat = 8.0
+
+    /// Used to load images for attachments.
+    ///
+    lazy var imageSource: WPTableImageSource? = {
+        let source = WPTableImageSource(maxSize: self.maxDisplaySize)
+        source?.delegate = self
+        source?.forceLargerSizeWhenFetching = false
+        source?.photonQuality = 65
+        return source
+    }()
+
+    fileprivate var collectionView: UICollectionView
+    fileprivate var footerStack: UIStackView
+
+    var captionLabel: UILabel?
+    var pageLabel: UILabel?
+
+    /// Used to keep references to image attachments.
+    ///
+    fileprivate var mediaArray = [GalleryMedia]()
+
+    /// The maximum size for images.
+    ///
+    lazy var maxDisplaySize: CGSize = {
+        let bounds = UIScreen.main.bounds
+        let side = max(bounds.size.width, bounds.size.height)
+        return CGSize(width: side, height: side)
+    }()
+
+    let layout: UICollectionViewFlowLayout = {
+        let layout = UICollectionViewFlowLayout()
+        layout.scrollDirection = .horizontal
+        layout.minimumInteritemSpacing = 8.0
+        layout.minimumLineSpacing = 8.0
+        return layout
+    }()
+
+    var imageAttachments = [WPTextAttachment]() {
+        didSet {
+            if imageAttachments.count > 0 {
+                //Set Up Initial Text
+                let pageLabels = labelForAttachment(atIndex: 0)
+                captionLabel?.text = pageLabels.title
+                pageLabel?.text = pageLabels.pageNumber
+            }
+        }
+    }
+    var handleGalleryTapped : ((_ selectedIndex: Int, _ galleryImages: [WPTextAttachment]) -> ())?
+
+    override open var frame: CGRect {
+        didSet {
+            // If Voice Over is enabled, the OS will query for the accessibilityPath
+            // to know what region of the screen to highlight. If the path is nil
+            // the OS should fall back to computing based on the frame but this
+            // may be bugged. Setting the accessibilityPath avoids a crash.
+            accessibilityPath = UIBezierPath(rect: frame)
+        }
+    }
+
+
+    // MARK: Lifecycle
+
+    override init(frame: CGRect) {
+
+        viewHeight = frame.height
+
+        collectionView = UICollectionView(frame: frame, collectionViewLayout: layout)
+
+        let footerStack = UIStackView()
+        footerStack.translatesAutoresizingMaskIntoConstraints = false
+        self.footerStack = footerStack
+
+        super.init(frame: frame)
+
+        addSubview(collectionView)
+        addSubview(footerStack)
+
+        sharedSetup()
+    }
+
+    required public init?(coder aDecoder: NSCoder) {
+
+        collectionView = aDecoder.decodeObject(forKey: UICollectionView.classNameWithoutNamespaces()) as! UICollectionView
+        footerStack = aDecoder.decodeObject(forKey: UIStackView.classNameWithoutNamespaces()) as! UIStackView
+        contentURL = aDecoder.decodeObject(forKey: contentUrlKey) as? URL
+        linkURL = aDecoder.decodeObject(forKey: linkUrlKey) as? URL
+        viewHeight = aDecoder.decodeObject(forKey: viewHeightKey) as! CGFloat
+
+        super.init(coder: aDecoder)
+
+        sharedSetup()
+    }
+
+    override open func encode(with aCoder: NSCoder) {
+
+        aCoder.encode(collectionView, forKey: UICollectionView.classNameWithoutNamespaces())
+        aCoder.encode(footerStack, forKey: UIStackView.classNameWithoutNamespaces())
+
+        if let url = contentURL {
+            aCoder.encode(url, forKey: contentUrlKey)
+        }
+
+        if let url = linkURL {
+            aCoder.encode(url, forKey: linkUrlKey)
+        }
+
+        aCoder.encode(viewHeight, forKey: viewHeightKey)
+
+        super.encode(with: aCoder)
+    }
+
+    fileprivate func sharedSetup() {
+
+        clipsToBounds = true
+
+        setupCollectionView()
+        setupLabels()
+
+        collectionView.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
+        collectionView.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
+        collectionView.topAnchor.constraint(equalTo: layoutMarginsGuide.topAnchor).isActive = true
+        collectionView.bottomAnchor.constraint(equalTo: footerStack.topAnchor).isActive = true
+
+        footerStack.leadingAnchor.constraint(equalTo: layoutMarginsGuide.leadingAnchor).isActive = true
+        footerStack.trailingAnchor.constraint(equalTo: layoutMarginsGuide.trailingAnchor).isActive = true
+        footerStack.heightAnchor.constraint(equalToConstant: 20.0).isActive = true
+    }
+
+    fileprivate func setupLabels() {
+
+        let captionLabel = UILabel()
+        self.captionLabel = captionLabel
+        WPStyleGuide.applyPageTitleStyle(captionLabel)
+        footerStack.addArrangedSubview(captionLabel)
+
+        let pageLabel = UILabel()
+        self.pageLabel = pageLabel
+        WPStyleGuide.applyReaderCardSummaryLabelStyle(pageLabel)
+        footerStack.addArrangedSubview(pageLabel)
+    }
+
+    fileprivate func labelForAttachment(atIndex index: Int) -> (title: String?, pageNumber: String?) {
+
+        guard let attachment = imageAttachments[safe: index] else {
+            return (nil, nil)
+        }
+
+        let imageTitle = attachment.attributes?["title"]
+        let altTitle = attachment.attributes?["alt"]
+
+        let title = imageTitle ?? altTitle
+        let page = "\(index + 1)/\(imageAttachments.count)"
+
+        return (title, page)
+    }
+
+    fileprivate func setupCollectionView() {
+
+        let galleryXib = UINib(nibName: galleryCellIdentifier, bundle: Bundle.main)
+
+        collectionView.register(galleryXib, forCellWithReuseIdentifier: galleryCellIdentifier)
+        collectionView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
+
+        collectionView.backgroundColor = .clear
+        collectionView.clipsToBounds = false
+
+        collectionView.dataSource = self
+        collectionView.delegate = self
+
+        collectionView.showsHorizontalScrollIndicator = false
+    }
+
+
+    // MARK: Public Methods
+
+    func contentSize() -> CGSize {
+        return CGSize(width: collectionView.frame.width, height: viewHeight)
+    }
+
+    func contentRatio() -> CGFloat {
+        return collectionView.frame.width / viewHeight
+    }
+}
+
+extension WPRichTextGallery: UICollectionViewDataSource {
+
+    func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
+        return imageAttachments.count
+    }
+
+    func numberOfSections(in collectionView: UICollectionView) -> Int {
+        return 1
+    }
+
+    func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: galleryCellIdentifier, for: indexPath) as! ReaderGalleryCell
+        let attachment = imageAttachments[indexPath.row]
+
+        if let url = URL(string: attachment.src) {
+            if let cachedImage = imageSource?.image(for: url, with: maxDisplaySize) {
+                cell.galleryImageView.image = cachedImage
+                attachment.maxSize = cachedImage.size
+                cell.loadingIndicator.stopAnimating()
+            } else {
+                let index = mediaArray.count
+                let indexPath = IndexPath(row: index, section: 1)
+                cell.loadingIndicator.startAnimating()
+                imageSource?.fetchImage(for: url, with: maxDisplaySize, indexPath: indexPath, isPrivate: isPrivate)
+            }
+
+            let media = GalleryMedia(cell: cell, attachment: attachment)
+            mediaArray.append(media)
+        }
+
+        return cell
+    }
+
+}
+
+extension WPRichTextGallery: UICollectionViewDelegateFlowLayout {
+
+    func setOffsetIfNeeded() {
+        //TODO: Still Needs Fixing
+        let leadingEdge = frame.minX - (superview?.frame.minX ?? 0)
+
+        if leadingEdge < 16 {
+            let neededOffset = 16 - leadingEdge
+
+            collectionView.contentInset = UIEdgeInsets(top: 0, left: neededOffset, bottom: 0, right: 0)
+        }
+    }
+
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+
+        let leadingEdge = frame.minX - (superview?.frame.minX ?? 0)
+        let superWidth = superview?.frame.width ?? 0
+        let cellWidth = superWidth - (2 * leadingEdge)
+
+        self.cellWidth = cellWidth
+
+        let height = collectionView.bounds.height > 0 ? collectionView.bounds.height : viewHeight
+
+        return CGSize(width: cellWidth, height: height)
+    }
+
+    func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
+        handleGalleryTapped?(indexPath.row, imageAttachments)
+    }
+
+    /// Stackoverflow
+    /// https://stackoverflow.com/a/46303794
+    /// In case the user scrolls for a long swipe, the scroll view should animate to the nearest page when the scrollview decelerated.
+    ///
+
+    func scrollViewWillEndDragging(_ scrollView: UIScrollView, withVelocity velocity: CGPoint, targetContentOffset: UnsafeMutablePointer<CGPoint>) {
+        scrollToPage(scrollView, withVelocity: velocity)
+    }
+
+    func scrollToPage(_ scrollView: UIScrollView, withVelocity velocity: CGPoint) {
+
+        var page = calculateCurrentPage(scrollView: scrollView)
+        if velocity.x > 0 {
+            page += 1
+        }
+        if velocity.x < 0 {
+            page -= 1
+        }
+        page = max(page, 0)
+        let newOffset: CGFloat = CGFloat(page) * (cellWidth + cellPadding)
+
+        scrollView.setContentOffset(CGPoint(x: newOffset, y: 0), animated: true)
+    }
+
+    func calculateCurrentPage(scrollView: UIScrollView) -> Int {
+
+        let page  = Int((scrollView.contentOffset.x - cellWidth / 2) / (cellWidth + cellPadding) + 1)
+        return page
+    }
+
+    func scrollViewDidEndDecelerating(_ scrollView: UIScrollView) {
+        scrollToPage(scrollView, withVelocity: CGPoint(x: 0, y: 0))
+
+        /// Thanks Stackoverflow
+        /// https://stackoverflow.com/a/36190887
+
+        let page = calculateCurrentPage(scrollView: scrollView)
+
+        let pageLabels = labelForAttachment(atIndex: page)
+        captionLabel?.text = pageLabels.title
+        pageLabel?.text = pageLabels.pageNumber
+    }
+
+}
+
+extension WPRichTextGallery: WPTableImageSourceDelegate {
+
+    func tableImageSource(_ tableImageSource: WPTableImageSource!, imageReady image: UIImage!, for indexPath: IndexPath!) {
+        let richMedia = mediaArray[indexPath.row]
+
+        richMedia.cell.galleryImageView.image = image
+        richMedia.attachment.maxSize = image.size
+        richMedia.cell.loadingIndicator.stopAnimating()
+
+        collectionView.reloadData()
+    }
+
+    func tableImageSource(_ tableImageSource: WPTableImageSource!, imageFailedforIndexPath indexPath: IndexPath!, error: Error!) {
+        let richMedia = mediaArray[indexPath.row]
+        DDLogError("Error loading image: \(richMedia.attachment.src)")
+        DDLogError("\(error)")
+    }
+}
+
+struct GalleryMedia {
+    let cell: ReaderGalleryCell
+    let attachment: WPTextAttachment
+}
diff --git a/WordPress/WordPress.xcodeproj/project.pbxproj b/WordPress/WordPress.xcodeproj/project.pbxproj
index c89b2a870f7a..b4669600c4c2 100644
--- a/WordPress/WordPress.xcodeproj/project.pbxproj
+++ b/WordPress/WordPress.xcodeproj/project.pbxproj
@@ -316,6 +316,10 @@
 		5DFA7EC31AF7CB910072023B /* Pages.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5DFA7EC21AF7CB910072023B /* Pages.storyboard */; };
 		5DFA7EC71AF814E40072023B /* PageListTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 5DFA7EC51AF814E40072023B /* PageListTableViewCell.m */; };
 		5DFA7EC81AF814E40072023B /* PageListTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5DFA7EC61AF814E40072023B /* PageListTableViewCell.xib */; };
+		5FDAFE601FB956A80090CDAD /* WPGalleryPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FDAFE5F1FB956A70090CDAD /* WPGalleryPageViewController.swift */; };
+		5FFB9D681FB799C200C7368C /* WPRichTextGallery.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FFB9D671FB799C200C7368C /* WPRichTextGallery.swift */; };
+		5FFB9D701FB7BF7E00C7368C /* ReaderGalleryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5FFB9D6E1FB7BF7E00C7368C /* ReaderGalleryCell.swift */; };
+		5FFB9D711FB7BF7E00C7368C /* ReaderGalleryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5FFB9D6F1FB7BF7E00C7368C /* ReaderGalleryCell.xib */; };
 		7059CD210F332B6500A0660B /* WPCategoryTree.m in Sources */ = {isa = PBXBuildFile; fileRef = 7059CD200F332B6500A0660B /* WPCategoryTree.m */; };
 		722F5726ACB4A276B0CF3C83 /* Pods_WordPress.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 556E3A9C1600564F6A3CADF6 /* Pods_WordPress.framework */; };
 		740BD8351A0D4C3600F04D18 /* WPUploadStatusButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 740BD8341A0D4C3600F04D18 /* WPUploadStatusButton.m */; };
@@ -1491,6 +1495,10 @@
 		5DFA7EC41AF814E40072023B /* PageListTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageListTableViewCell.h; sourceTree = "<group>"; };
 		5DFA7EC51AF814E40072023B /* PageListTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PageListTableViewCell.m; sourceTree = "<group>"; };
 		5DFA7EC61AF814E40072023B /* PageListTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PageListTableViewCell.xib; sourceTree = "<group>"; };
+		5FDAFE5F1FB956A70090CDAD /* WPGalleryPageViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WPGalleryPageViewController.swift; sourceTree = "<group>"; };
+		5FFB9D671FB799C200C7368C /* WPRichTextGallery.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WPRichTextGallery.swift; sourceTree = "<group>"; };
+		5FFB9D6E1FB7BF7E00C7368C /* ReaderGalleryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderGalleryCell.swift; sourceTree = "<group>"; };
+		5FFB9D6F1FB7BF7E00C7368C /* ReaderGalleryCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ReaderGalleryCell.xib; sourceTree = "<group>"; };
 		6EDC0E8E105881A800F68A1D /* iTunesArtwork */ = {isa = PBXFileReference; lastKnownFileType = file; path = iTunesArtwork; sourceTree = "<group>"; };
 		7059CD1F0F332B6500A0660B /* WPCategoryTree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = WPCategoryTree.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		7059CD200F332B6500A0660B /* WPCategoryTree.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = WPCategoryTree.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
@@ -1747,7 +1755,7 @@
 		A20971B719B0BC570058F395 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/Localizable.strings"; sourceTree = "<group>"; };
 		A20971B819B0BC570058F395 /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		A284044518BFE7F300D982B6 /* WordPress 15.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "WordPress 15.xcdatamodel"; sourceTree = "<group>"; };
-		A28F6FD119B61ACA00AADE55 /* SwiftPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = SwiftPlayground.playground; sourceTree = "<group>"; };
+		A28F6FD119B61ACA00AADE55 /* SwiftPlayground.playground */ = {isa = PBXFileReference; lastKnownFileType = file.playground; path = SwiftPlayground.playground; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		A2DC5B181953451B009584C3 /* WPNUXHelpBadgeLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WPNUXHelpBadgeLabel.h; sourceTree = "<group>"; };
 		A2DC5B191953451B009584C3 /* WPNUXHelpBadgeLabel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WPNUXHelpBadgeLabel.m; sourceTree = "<group>"; };
 		ACBAB5FC0E121C7300F38795 /* PostSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostSettingsViewController.h; sourceTree = "<group>"; usesTabs = 0; };
@@ -2817,7 +2825,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		29B97314FDCFA39411CA2CEA = {
+		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
 				E1B34C091CCDFFCE00889709 /* Credentials */,
@@ -3136,6 +3144,8 @@
 				088B89881DA6F93B000E8DEF /* ReaderPostCardContentLabel.swift */,
 				E60C2ED41DE5048200488630 /* ReaderCommentCell.xib */,
 				E60C2ED61DE5075100488630 /* ReaderCommentCell.swift */,
+				5FFB9D6E1FB7BF7E00C7368C /* ReaderGalleryCell.swift */,
+				5FFB9D6F1FB7BF7E00C7368C /* ReaderGalleryCell.xib */,
 			);
 			name = Views;
 			sourceTree = "<group>";
@@ -3155,6 +3165,7 @@
 				E6DE44661B90D251000FA7EF /* ReaderHelpers.swift */,
 				5DF8D25F19E82B1000A2CD95 /* ReaderCommentsViewController.h */,
 				5DF8D26019E82B1000A2CD95 /* ReaderCommentsViewController.m */,
+				5FDAFE5F1FB956A70090CDAD /* WPGalleryPageViewController.swift */,
 				5D42A401175E76A1005CFF05 /* WPImageViewController.h */,
 				5D42A402175E76A2005CFF05 /* WPImageViewController.m */,
 			);
@@ -5037,6 +5048,7 @@
 			children = (
 				E6805D2D1DCD399600168E4F /* WPRichTextEmbed.swift */,
 				E6805D2E1DCD399600168E4F /* WPRichTextImage.swift */,
+				5FFB9D671FB799C200C7368C /* WPRichTextGallery.swift */,
 				E6805D2F1DCD399600168E4F /* WPRichTextMediaAttachment.swift */,
 				E62AFB651DC8E593007484FC /* NSAttributedString+WPRichText.swift */,
 				E62AFB661DC8E593007484FC /* WPRichContentView.swift */,
@@ -5572,7 +5584,7 @@
 				bg,
 				sk,
 			);
-			mainGroup = 29B97314FDCFA39411CA2CEA;
+			mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */;
 			productRefGroup = 19C28FACFE9D520D11CA2CBB /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -5664,6 +5676,7 @@
 				5D6C4AFF1B603CE9005E3C43 /* EditCommentViewController.xib in Resources */,
 				B51535D41BBB16AA0029B84B /* Launch Screen.storyboard in Resources */,
 				08216FAA1CDBF95100304BA7 /* MenuItemEditing.storyboard in Resources */,
+				5FFB9D711FB7BF7E00C7368C /* ReaderGalleryCell.xib in Resources */,
 				747084101E269669002CA726 /* JetpackLoginViewController.xib in Resources */,
 				5D6C4B021B603D1F005E3C43 /* WPWebViewController.xib in Resources */,
 				E6D3E84B1BEBD888002692E8 /* ReaderCrossPostCell.xib in Resources */,
@@ -5887,7 +5900,7 @@
 			inputPaths = (
 				"${SRCROOT}/../Pods/Target Support Files/Pods-WordPress/Pods-WordPress-resources.sh",
 				"${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle",
-				"$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle",
+				$PODS_CONFIGURATION_BUILD_DIR/HockeySDK/HockeySDKResources.bundle,
 			);
 			name = "[CP] Copy Pods Resources";
 			outputPaths = (
@@ -6322,6 +6335,7 @@
 				834CAE9F122D56B1003DDF49 /* UIImage+Alpha.m in Sources */,
 				1702BBE01CF3034E00766A33 /* DomainsService.swift in Sources */,
 				E62AFB6A1DC8E593007484FC /* NSAttributedString+WPRichText.swift in Sources */,
+				5FFB9D701FB7BF7E00C7368C /* ReaderGalleryCell.swift in Sources */,
 				B54866CA1A0D7042004AC79D /* NSAttributedString+Helpers.swift in Sources */,
 				834CAEA0122D56B1003DDF49 /* UIImage+RoundedCorner.m in Sources */,
 				E105205B1F2B1CF400A948F6 /* BlogToBlogMigration_61_62.swift in Sources */,
@@ -6354,6 +6368,7 @@
 				FFB7B8201A0012E80032E723 /* ApiCredentials.m in Sources */,
 				B5DB8AF41C949DC20059196A /* WPImmuTableRows.swift in Sources */,
 				E6311C411EC9FF4A00122529 /* UsersService.swift in Sources */,
+				5FDAFE601FB956A80090CDAD /* WPGalleryPageViewController.swift in Sources */,
 				BEC62E2C1BF2F58D007685B2 /* CreateNewBlogViewController.m in Sources */,
 				E125F1E71E8E59C800320B67 /* SharePost+UIActivityItemSource.swift in Sources */,
 				E1B62A7B13AA61A100A6FCA4 /* WPWebViewController.m in Sources */,
@@ -6721,6 +6736,7 @@
 				E1EBC36F1C118EA500F638E0 /* ImmuTable.swift in Sources */,
 				B59B18751CC7FB8D0055EB7C /* PersonViewController.swift in Sources */,
 				E6FACB1E1EC675E300284AC7 /* GravatarProfile.swift in Sources */,
+				5FFB9D681FB799C200C7368C /* WPRichTextGallery.swift in Sources */,
 				827704F11F607C0E002E8A03 /* JetpackConnectionViewController.swift in Sources */,
 				5D839AAB187F0D8000811F4A /* PostGeolocationCell.m in Sources */,
 				5D732F971AE84E3C00CD89E7 /* PostListFooterView.m in Sources */,
@@ -7177,7 +7193,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				WPCOM_CONFIG = "$HOME/.wpcom_app_credentials";
+				WPCOM_CONFIG = $HOME/.wpcom_app_credentials;
 				WPCOM_SCHEME = wpdebug;
 			};
 			name = Debug;
@@ -7243,7 +7259,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				WPCOM_CONFIG = "$HOME/.wpcom_app_credentials";
+				WPCOM_CONFIG = $HOME/.wpcom_app_credentials;
 				WPCOM_SCHEME = wordpress;
 			};
 			name = Release;
@@ -7536,7 +7552,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				WPCOM_CONFIG = "$HOME/.wpcom_alpha_app_credentials";
+				WPCOM_CONFIG = $HOME/.wpcom_alpha_app_credentials;
 				WPCOM_SCHEME = wpalpha;
 			};
 			name = "Release-Alpha";
@@ -7970,7 +7986,7 @@
 				SWIFT_OBJC_BRIDGING_HEADER = "Classes/System/WordPress-Bridging-Header.h";
 				SWIFT_VERSION = 3.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
-				WPCOM_CONFIG = "$HOME/.wpcom_internal_app_credentials";
+				WPCOM_CONFIG = $HOME/.wpcom_internal_app_credentials;
 				WPCOM_SCHEME = wpinternal;
 			};
 			name = "Release-Internal";
diff --git a/WordPressShared/WordPressShared/Core/Utility/RichContentFormatter.swift b/WordPressShared/WordPressShared/Core/Utility/RichContentFormatter.swift
index 4b599704293b..bff0f3a78e04 100644
--- a/WordPressShared/WordPressShared/Core/Utility/RichContentFormatter.swift
+++ b/WordPressShared/WordPressShared/Core/Utility/RichContentFormatter.swift
@@ -25,6 +25,10 @@ import Foundation
 
         // Gallery Images
         static let galleryImgTags = try! NSRegularExpression(pattern: "<img[^>]*data-orig-file[^>]*/>", options: .caseInsensitive)
+        static let galleryStartIdentifier = "WPGalleryStartIdentifier"
+        static let galleryEndIdentifier = "WPGalleryEndIdentifier"
+        static let galleryDivStart = try! NSRegularExpression(pattern: "<div[^>]*?\(galleryStartIdentifier)[^>]*?>", options: .caseInsensitive)
+        static let galleryDivEnd = try! NSRegularExpression(pattern: "</div[^>]*?\(galleryEndIdentifier)[^>]*?>", options: .caseInsensitive)
 
         // Trailing BR Tags
         static let trailingBRTags = try! NSRegularExpression(pattern: "(\\s*<br\\s*(/?)\\s*>\\s*)+$", options: .caseInsensitive)
@@ -41,12 +45,13 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func formatContentString(_ string: String, isPrivateSite isPrivate: Bool) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
 
         var content = string
         content = removeForbiddenTags(content)
+        content = normalizeGallery(content)
         content = normalizeParagraphs(content)
         content = removeInlineStyles(content)
         content = (content as NSString).replacingHTMLEmoticonsWithEmoji() as String
@@ -64,24 +69,24 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func removeForbiddenTags(_ string: String) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
         var content = string
 
         content = RegEx.styleTags.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: "")
 
         content = RegEx.scriptTags.stringByReplacingMatches(in: content,
                                                                     options: .reportCompletion,
-                                                                    range: NSRange(location: 0, length: content.characters.count),
+                                                                    range: NSRange(location: 0, length: content.count),
                                                                     withTemplate: "")
 
         content = RegEx.tableTags.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: "")
 
         return content
@@ -96,7 +101,7 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func normalizeParagraphs(_ string: String) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
         var content = string
@@ -106,23 +111,23 @@ import Foundation
          // Convert div tags to p tags
         content = RegEx.divTagsStart.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: openPTag)
 
         content = RegEx.divTagsEnd.stringByReplacingMatches(in: content,
                                                                     options: .reportCompletion,
-                                                                    range: NSRange(location: 0, length: content.characters.count),
+                                                                    range: NSRange(location: 0, length: content.count),
                                                                     withTemplate: closePTag)
 
         // Remove duplicate/redundant p tags.
         content = RegEx.pTagsStart.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: openPTag)
 
         content = RegEx.pTagsEnd.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: closePTag)
 
         content = filterNewLines(content)
@@ -130,18 +135,120 @@ import Foundation
         return content
     }
 
-
+    
+    /// Converts DIV with class gallery class to gallery tags
+    ///
+    /// - Parameters:
+    ///     - string: The content string to format.
+    ///
+    /// - Returns: The formatted string.
+    ///
+    public class func normalizeGallery(_ string : String) -> String {
+        
+        guard string.count > 0 else {
+            return string
+        }
+        
+        //Types of WP Galleries
+        let iconGallery = "class='gallery"
+        let tiledGallery = "class=\"tiled-gallery"
+        
+        //Gallery Tag for identification
+        let galleryStart = "<gallery>"
+        let galleryEnd = "</gallery>"
+        
+        var content = string
+        
+        //Scan and Insert Indentifier for Gallery Start and End
+        content = scanForGalleryBy(galleryType: iconGallery, inString: content)
+        content = scanForGalleryBy(galleryType: tiledGallery, inString: content)
+        
+        //Replace Div with Gallery tag
+        content = RegEx.galleryDivStart.stringByReplacingMatches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.count), withTemplate: galleryStart)
+        content = RegEx.galleryDivEnd.stringByReplacingMatches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.count), withTemplate: galleryEnd)
+        
+        return content
+    }
+    
+    private class func scanForGalleryBy(galleryType : String, inString : String) -> String {
+        
+        let galleryScanner = Scanner(string: inString)
+        galleryScanner.charactersToBeSkipped = nil
+        
+        let divStr = "div"
+        
+        var str = ""
+        var tempStr: NSString? = ""
+        
+        var divCounter = 0
+        var galleriesFound : Int = 0
+        
+        while !galleryScanner.isAtEnd {
+            
+            if galleriesFound <= 0 {
+                //check for gallery
+                galleryScanner.scanUpTo(galleryType, into: &tempStr)
+                
+                if let tempStr = tempStr {
+                    str += tempStr as String
+                }
+                
+                tempStr = ""
+                if galleryScanner.isAtEnd {
+                    break //nothing to see here
+                } else {
+                    galleriesFound += 1
+                    divCounter += 1
+                }
+                
+                str += galleryType
+                str += RegEx.galleryStartIdentifier
+                galleryScanner.scanLocation += Int(galleryType.count)
+                
+            } else {
+                
+                //gallery found, proceed to find divs
+                galleryScanner.scanUpTo(divStr, into: &tempStr)
+                
+                if let tempStr = tempStr {
+                    str += tempStr as String
+                }
+                
+                tempStr = ""
+                if galleryScanner.isAtEnd {
+                    break //nothing to see here
+                }
+                
+                if str.last == "/" {
+                    divCounter -= 1
+                } else if str.last == "<" {
+                    divCounter += 1
+                }
+                
+                galleryScanner.scanLocation += divStr.count
+                str += divStr
+                
+                if divCounter == 0 {
+                    galleriesFound -= 1
+                    str += RegEx.galleryEndIdentifier
+                }
+            }
+        }
+        
+        return str
+    }
+    
     public class func filterNewLines(_ string: String) -> String {
         var content = string
 
         var ranges = [NSRange]()
         // We don't want to remove new lines from preformatted tag blocks,
         // so get the ranges of such blocks.
-        let matches = RegEx.preTags.matches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.characters.count))
+        let matches = RegEx.preTags.matches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.count))
         if matches.count == 0 {
 
             // No blocks found, so we'll parse the whole string.
-            ranges.append(NSRange(location: 0, length: content.characters.count))
+            ranges.append(NSRange(location: 0, length: content.count))
 
         } else {
 
@@ -157,7 +264,7 @@ import Foundation
                 location = match.range.location + match.range.length
             }
 
-            length = content.characters.count - location
+            length = content.count - location
             ranges.append(NSRange(location: location, length: length))
         }
 
@@ -182,14 +289,14 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func removeInlineStyles(_ string: String) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
         var content = string
 
         content = RegEx.styleAttr.stringByReplacingMatches(in: content,
                                                                    options: .reportCompletion,
-                                                                   range: NSRange(location: 0, length: content.characters.count),
+                                                                   range: NSRange(location: 0, length: content.count),
                                                                    withTemplate: "")
 
         return content
@@ -205,7 +312,7 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func resizeGalleryImageURL(_ string: String, isPrivateSite isPrivate: Bool) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
 
@@ -241,7 +348,7 @@ import Foundation
             mImageStr.replaceOccurrences(of: srcImgURLStr,
                                          with: modifiedURL.absoluteString,
                                          options: .literal,
-                                         range: NSRange(location: 0, length: imgElementStr.characters.count))
+                                         range: NSRange(location: 0, length: imgElementStr.count))
 
             mContent.replaceCharacters(in: match.range, with: mImageStr as String)
         }
@@ -283,13 +390,13 @@ import Foundation
     /// - Returns: The formatted string.
     ///
     public class func removeTrailingBreakTags(_ string: String) -> String {
-        guard string.characters.count > 0 else {
+        guard string.count > 0 else {
             return string
         }
         var content = string.trim()
-        let matches = RegEx.trailingBRTags.matches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.characters.count))
+        let matches = RegEx.trailingBRTags.matches(in: content, options: .reportCompletion, range: NSRange(location: 0, length: content.count))
         if let match = matches.first {
-            let index = content.characters.index(content.startIndex, offsetBy: match.range.location)
+            let index = content.index(content.startIndex, offsetBy: match.range.location)
             content = content.substring(to: index)
         }