diff --git a/Riot/Assets/en.lproj/Vector.strings b/Riot/Assets/en.lproj/Vector.strings
index 9abf487b1..84c55490c 100644
--- a/Riot/Assets/en.lproj/Vector.strings
+++ b/Riot/Assets/en.lproj/Vector.strings
@@ -693,6 +693,7 @@
 
 // Service terms
 "service_terms_modal_title" = "Terms Of Service";
+"service_terms_modal_message" = "To continue you need to accept the Terms of this service.";
 "service_terms_modal_accept_button" = "Accept";
 
 // Deactivate account
diff --git a/Riot/Generated/Strings.swift b/Riot/Generated/Strings.swift
index 4bf3b7bcd..400c25f10 100644
--- a/Riot/Generated/Strings.swift
+++ b/Riot/Generated/Strings.swift
@@ -2346,6 +2346,10 @@ internal enum VectorL10n {
   internal static var serviceTermsModalAcceptButton: String { 
     return VectorL10n.tr("Vector", "service_terms_modal_accept_button") 
   }
+  /// To continue you need to accept the Terms of this service.
+  internal static var serviceTermsModalMessage: String { 
+    return VectorL10n.tr("Vector", "service_terms_modal_message") 
+  }
   /// Terms Of Service
   internal static var serviceTermsModalTitle: String { 
     return VectorL10n.tr("Vector", "service_terms_modal_title") 
diff --git a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewAction.swift b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewAction.swift
index 163bd73c1..5ee84b4df 100644
--- a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewAction.swift
+++ b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewAction.swift
@@ -21,6 +21,7 @@ import Foundation
 /// ServiceTermsModalScreenViewController view actions exposed to view model
 enum ServiceTermsModalScreenViewAction {
     case load
+    case review(String)
     case accept
     case cancel
 }
diff --git a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.storyboard b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.storyboard
index e1170d964..14f783356 100644
--- a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.storyboard
+++ b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.storyboard
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="V8j-Lb-PgC">
+    <device id="retina6_1" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -11,29 +15,40 @@
             <objects>
                 <viewController extendedLayoutIncludesOpaqueBars="YES" automaticallyAdjustsScrollViewInsets="NO" id="V8j-Lb-PgC" customClass="ServiceTermsModalScreenViewController" customModule="Riot" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="EL9-GA-lwo">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9U2-KL-ZVA">
-                                <rect key="frame" x="0.0" y="20" width="600" height="580"/>
+                                <rect key="frame" x="0.0" y="44" width="414" height="852"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e7g-um-WO4">
-                                        <rect key="frame" x="0.0" y="0.0" width="600" height="500"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="414" height="500"/>
                                         <subviews>
                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="voD-3Q-ryt">
-                                                <rect key="frame" x="50" y="0.0" width="500" height="500"/>
+                                                <rect key="frame" x="0.0" y="0.0" width="414" height="500"/>
                                                 <subviews>
-                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="A message" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxI-mu-qng">
-                                                        <rect key="frame" x="20" y="86" width="335" height="108"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="To continue you need to accept the Terms of this service." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bxI-mu-qng">
+                                                        <rect key="frame" x="20" y="50" width="374" height="100"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="100" id="1bP-8m-xrd"/>
+                                                        </constraints>
                                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
-                                                        <rect key="frame" x="104" y="368" width="167" height="30"/>
-                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                        <state key="normal" title="OK"/>
+                                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="swq-xw-ItG">
+                                                        <rect key="frame" x="20" y="194" width="374" height="200"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="200" id="tSa-EG-4Hy"/>
+                                                        </constraints>
+                                                    </tableView>
+                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
+                                                        <rect key="frame" x="20" y="438" width="374" height="44"/>
+                                                        <constraints>
+                                                            <constraint firstAttribute="height" constant="44" id="d2a-Dw-Pu5"/>
+                                                        </constraints>
+                                                        <state key="normal" title="Accept"/>
                                                         <connections>
                                                             <action selector="acceptButtonAction:" destination="V8j-Lb-PgC" eventType="touchUpInside" id="uvI-tt-Nfj"/>
                                                         </connections>
@@ -41,7 +56,17 @@
                                                 </subviews>
                                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <constraints>
+                                                    <constraint firstItem="bxI-mu-qng" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" symbolic="YES" id="1K2-u8-QsL"/>
+                                                    <constraint firstAttribute="trailing" secondItem="bxI-mu-qng" secondAttribute="trailing" constant="20" symbolic="YES" id="41D-TP-69f"/>
+                                                    <constraint firstItem="DOt-5E-FjF" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" symbolic="YES" id="43V-Ya-vks"/>
+                                                    <constraint firstItem="bxI-mu-qng" firstAttribute="top" secondItem="voD-3Q-ryt" secondAttribute="top" constant="50" id="7dn-ZC-muM"/>
+                                                    <constraint firstItem="swq-xw-ItG" firstAttribute="top" secondItem="bxI-mu-qng" secondAttribute="bottom" constant="44" id="9Gg-Xb-o2W"/>
+                                                    <constraint firstItem="bxI-mu-qng" firstAttribute="top" secondItem="voD-3Q-ryt" secondAttribute="top" constant="50" id="W1m-x0-TyS"/>
+                                                    <constraint firstAttribute="trailing" secondItem="swq-xw-ItG" secondAttribute="trailing" constant="20" symbolic="YES" id="Y5v-Gg-xkM"/>
                                                     <constraint firstAttribute="width" priority="750" constant="500" id="glD-Sz-73O"/>
+                                                    <constraint firstItem="DOt-5E-FjF" firstAttribute="top" secondItem="swq-xw-ItG" secondAttribute="bottom" constant="44" id="ie9-kP-8b2"/>
+                                                    <constraint firstAttribute="trailing" secondItem="DOt-5E-FjF" secondAttribute="trailing" constant="20" symbolic="YES" id="lpw-9u-VDG"/>
+                                                    <constraint firstItem="swq-xw-ItG" firstAttribute="leading" secondItem="voD-3Q-ryt" secondAttribute="leading" constant="20" symbolic="YES" id="ze1-Iw-v9U"/>
                                                 </constraints>
                                             </view>
                                         </subviews>
@@ -75,9 +100,10 @@
                         <viewLayoutGuide key="safeArea" id="bFg-jh-JZB"/>
                     </view>
                     <connections>
+                        <outlet property="acceptButton" destination="DOt-5E-FjF" id="ktw-U4-efQ"/>
                         <outlet property="messageLabel" destination="bxI-mu-qng" id="pbX-aZ-inC"/>
-                        <outlet property="okButton" destination="DOt-5E-FjF" id="ktw-U4-efQ"/>
                         <outlet property="scrollView" destination="9U2-KL-ZVA" id="ojG-2y-X7b"/>
+                        <outlet property="tableView" destination="swq-xw-ItG" id="Fwb-Sc-bec"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="zK0-v6-7Wt" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
index ab14782d4..74c85ec37 100644
--- a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
+++ b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewController.swift
@@ -22,10 +22,6 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     
     // MARK: - Constants
     
-    private enum Constants {
-        static let aConstant: Int = 666
-    }
-    
     // MARK: - Properties
     
     // MARK: Outlets
@@ -33,7 +29,8 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     @IBOutlet private weak var scrollView: UIScrollView!
     
     @IBOutlet private weak var messageLabel: UILabel!
-    @IBOutlet private weak var okButton: UIButton!
+    @IBOutlet private weak var tableView: UITableView!
+    @IBOutlet private weak var acceptButton: UIButton!
     
     // MARK: Private
 
@@ -42,6 +39,11 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     private var errorPresenter: MXKErrorPresentation!
     private var activityPresenter: ActivityIndicatorPresenter!
 
+    private var policies: [MXLoginPolicyData] = []
+
+    /// Policies checked by the end user
+    private var checkedPolicies: Set<Int> = []
+
     // MARK: - Setup
     
     class func instantiate(with viewModel: ServiceTermsModalScreenViewModelType) -> ServiceTermsModalScreenViewController {
@@ -59,7 +61,7 @@ final class ServiceTermsModalScreenViewController: UIViewController {
         // Do any additional setup after loading the view.
         
         self.title = VectorL10n.serviceTermsModalTitle
-        
+
         self.setupViews()
         self.activityPresenter = ActivityIndicatorPresenter()
         self.errorPresenter = MXKErrorAlertPresentation()
@@ -87,12 +89,10 @@ final class ServiceTermsModalScreenViewController: UIViewController {
             theme.applyStyle(onNavigationBar: navigationBar)
         }
 
-
-        // TODO:
         self.messageLabel.textColor = theme.textPrimaryColor
 
-        self.okButton.backgroundColor = theme.backgroundColor
-        theme.applyStyle(onButton: self.okButton)
+        self.acceptButton.backgroundColor = theme.backgroundColor
+        theme.applyStyle(onButton: self.acceptButton)
     }
     
     private func registerThemeServiceDidChangeThemeNotification() {
@@ -109,11 +109,22 @@ final class ServiceTermsModalScreenViewController: UIViewController {
         }
         
         self.navigationItem.rightBarButtonItem = cancelBarButtonItem
-        
+
+        self.setupTableView()
         self.scrollView.keyboardDismissMode = .interactive
         
-        self.messageLabel.text = "VectorL10n.ServiceTermsModalScreenTitle"
-        self.messageLabel.isHidden = true
+        self.messageLabel.text = VectorL10n.serviceTermsModalMessage
+
+        self.acceptButton.setTitle(VectorL10n.serviceTermsModalAcceptButton, for: .normal)
+        self.acceptButton.setTitle(VectorL10n.serviceTermsModalAcceptButton, for: .highlighted)
+        self.refreshAcceptButton()
+    }
+
+    private func setupTableView() {
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.separatorStyle = .none
+        tableView.register(TableViewCellWithCheckBoxAndLabel.nib(), forCellReuseIdentifier: TableViewCellWithCheckBoxAndLabel.defaultReuseIdentifier())
     }
 
     private func render(viewState: ServiceTermsModalScreenViewState) {
@@ -136,8 +147,8 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     private func renderLoaded(policies: [MXLoginPolicyData]) {
         self.activityPresenter.removeCurrentActivityIndicator(animated: true)
 
-        self.messageLabel.text = policies.first?.name
-        self.messageLabel.isHidden = false
+        self.policies = policies
+        self.refreshViews()
     }
 
     private func renderAccepting() {
@@ -153,6 +164,16 @@ final class ServiceTermsModalScreenViewController: UIViewController {
         self.errorPresenter.presentError(from: self, forError: error, animated: true, handler: nil)
     }
 
+    private func refreshViews() {
+        self.tableView.reloadData()
+        self.refreshAcceptButton()
+    }
+
+    private func refreshAcceptButton() {
+        // Enable the button only if the user has accepted all policies
+        self.acceptButton.isEnabled = (self.policies.count == self.checkedPolicies.count)
+    }
+
     
     // MARK: - Actions
 
@@ -163,6 +184,21 @@ final class ServiceTermsModalScreenViewController: UIViewController {
     private func cancelButtonAction() {
         self.viewModel.process(viewAction: .cancel)
     }
+
+    @objc private func didTapCheckbox(sender: UITapGestureRecognizer) {
+
+        guard let policyIndex = sender.view?.tag else {
+            return
+        }
+
+        if self.checkedPolicies.contains(policyIndex) {
+            self.checkedPolicies.remove(policyIndex)
+        } else {
+            checkedPolicies.insert(policyIndex)
+        }
+
+        self.refreshViews()
+    }
 }
 
 
@@ -173,3 +209,46 @@ extension ServiceTermsModalScreenViewController: ServiceTermsModalScreenViewMode
         self.render(viewState: viewSate)
     }
 }
+
+// MARK: - UITableViewDataSource
+
+extension ServiceTermsModalScreenViewController: UITableViewDataSource {
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return self.policies.count
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+
+        guard let cell = tableView.dequeueReusableCell(withIdentifier: TableViewCellWithCheckBoxAndLabel.defaultReuseIdentifier(), for: indexPath) as? TableViewCellWithCheckBoxAndLabel else {
+            fatalError("\(String(describing: TableViewCellWithCheckBoxAndLabel.self)) should be registered")
+        }
+
+        let policy = policies[indexPath.row]
+        let checked = checkedPolicies.contains(indexPath.row)
+
+        cell.label.text = policy.name
+        cell.isEnabled = checked
+        cell.accessoryType = .disclosureIndicator
+        cell.backgroundColor = UIColor.clear
+
+        if let checkBox = cell.checkBox, checkBox.gestureRecognizers?.isEmpty ?? true {
+            let gesture: UITapGestureRecognizer = UITapGestureRecognizer(target: self, action: #selector(didTapCheckbox))
+            gesture.numberOfTapsRequired = 1
+            gesture.numberOfTouchesRequired = 1
+
+            checkBox.isUserInteractionEnabled = true
+            checkBox.tag = indexPath.row
+            checkBox.addGestureRecognizer(gesture)
+        }
+
+        return cell
+    }
+}
+
+extension ServiceTermsModalScreenViewController: UITableViewDelegate {
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        let policy = policies[indexPath.row]
+        self.viewModel.process(viewAction: .review(policy.url))
+    }
+}
diff --git a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModel.swift b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModel.swift
index b683d687e..044efc78c 100644
--- a/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModel.swift
+++ b/Riot/Modules/ServiceTerms/Modal/Modal/ServiceTermsModalScreenViewModel.swift
@@ -48,6 +48,9 @@ final class ServiceTermsModalScreenViewModel: ServiceTermsModalScreenViewModelTy
         switch viewAction {
         case .load:
             self.loadTerms()
+        case .review(let policy):
+            // TODO
+            self.coordinatorDelegate?.ServiceTermsModalScreenViewModelDidCancel(self)
         case .accept:
             self.acceptTerms()
         case .cancel: