diff --git a/Podfile.lock b/Podfile.lock
index 06b3e5fd1a..238c11095c 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -81,4 +81,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 9d16cdea9e05545d9a0362c174a348ff9d9450ef
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.1
diff --git a/Riot.xcodeproj/project.pbxproj b/Riot.xcodeproj/project.pbxproj
index 752c21b6fb..5686118732 100644
--- a/Riot.xcodeproj/project.pbxproj
+++ b/Riot.xcodeproj/project.pbxproj
@@ -2155,7 +2155,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
diff --git a/Riot/ViewController/SettingsViewController.m b/Riot/ViewController/SettingsViewController.m
index 5d3cb9cd60..2f1b7cdd6a 100644
--- a/Riot/ViewController/SettingsViewController.m
+++ b/Riot/ViewController/SettingsViewController.m
@@ -36,8 +36,6 @@
 
 #import "NBPhoneNumberUtil.h"
 
-#import "OLMKit/OLMKit.h"
-
 NSString* const kSettingsViewControllerPhoneBookCountryCellId = @"kSettingsViewControllerPhoneBookCountryCellId";
 
 enum
@@ -71,7 +69,6 @@
 enum
 {
     OTHER_VERSION_INDEX = 0,
-    OTHER_OLM_VERSION_INDEX,
     OTHER_COPYRIGHT_INDEX,
     OTHER_TERM_CONDITIONS_INDEX,
     OTHER_PRIVACY_INDEX,
@@ -89,7 +86,8 @@
 };
 
 enum {
-    CRYPTOGRAPHY_INFO_INDEX = 0,
+    CRYPTOGRAPHY_OLM_VERSION_INDEX = 0,
+    CRYPTOGRAPHY_INFO_INDEX,
     CRYPTOGRAPHY_BLACKLIST_UNVERIFIED_DEVICES_INDEX,
     CRYPTOGRAPHY_EXPORT_INDEX,
     CRYPTOGRAPHY_COUNT
@@ -1593,16 +1591,6 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
             
             cell = versionCell;
         }
-        else if (row == OTHER_OLM_VERSION_INDEX)
-        {
-            MXKTableViewCell *versionCell = [self getDefaultTableViewCell:tableView];
-            
-            versionCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_olm_version", @"Vector", nil), [OLMKit versionString]];
-            
-            versionCell.selectionStyle = UITableViewCellSelectionStyleNone;
-            
-            cell = versionCell;
-        }
         else if (row == OTHER_TERM_CONDITIONS_INDEX)
         {
             MXKTableViewCell *termAndConditionCell = [self getDefaultTableViewCell:tableView];
@@ -1751,6 +1739,16 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
 
             cell = cryptoCell;
         }
+        else if (row == CRYPTOGRAPHY_OLM_VERSION_INDEX)
+        {
+            MXKTableViewCell *versionCell = [self getDefaultTableViewCell:tableView];
+
+            versionCell.textLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"settings_olm_version", @"Vector", nil), account.mxSession.crypto.olmVersion];
+
+            versionCell.selectionStyle = UITableViewCellSelectionStyleNone;
+
+            cell = versionCell;
+        }
         else if (row == CRYPTOGRAPHY_BLACKLIST_UNVERIFIED_DEVICES_INDEX)
         {
             MXKTableViewCellWithLabelAndSwitch* labelAndSwitchCell = [self getLabelAndSwitchCell:tableView forIndexPath:indexPath];