diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
index 607857d21f..da677e404f
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,71 @@
+# Xcode
+#
+
+## Build generated
+build/
+DerivedData/
+
+__MACOSX
 .DS_Store
-build
-*.mode1v3
+**/.DS_Store
+
+## Various settings
 *.pbxuser
-project.xcworkspace
-xcuserdata
-.svn
-DerivedData
-*.orig
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+
+## Other
+*.moved-aside
 *.xccheckout
 *.xcscmblueprint
-XMPPFramework*.zip
+ezPDFViewLibrary.framework
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+
+## Playgrounds
+timeline.xctimeline
+playground.xcworkspace
+
+# Swift Package Manager
+#
+# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
+# Packages/
+.build/
 
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# 
 Pods/
-Carthage/
-/.build
-/.swiftpm/
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the 
+# screenshots whenever they are needed.
+
+fastlane/report.xml
+fastlane/screenshots
+
+
+# Sonarqube
+.sonar/
+run-sonar-swift.sh
+sonar-project.properties
+sonar-reports/
+
+#Library
+
diff --git a/Extensions/XEP-0313/XMPPMessageArchiveManagement.m b/Extensions/XEP-0313/XMPPMessageArchiveManagement.m
index fcf5bf12c5..041118c052 100644
--- a/Extensions/XEP-0313/XMPPMessageArchiveManagement.m
+++ b/Extensions/XEP-0313/XMPPMessageArchiveManagement.m
@@ -20,7 +20,7 @@
 static const int xmppLogLevel = XMPP_LOG_LEVEL_WARN;
 #endif
 
-NSString *const XMLNS_XMPP_MAM = @"urn:xmpp:mam:2";
+NSString *const XMLNS_XMPP_MAM = @"urn:xmpp:mam:1";
 static NSString *const QueryIdAttributeName = @"queryid";
 
 
diff --git a/XMPPFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/XMPPFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/XMPPFramework.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/XMPPFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/XMPPFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000000..18d981003d
--- /dev/null
+++ b/XMPPFramework.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>