diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc
index 6352baeaf..6df5730f8 100644
--- a/Telegram/Resources/winrc/Telegram.rc
+++ b/Telegram/Resources/winrc/Telegram.rc
@@ -34,8 +34,8 @@ IDI_ICON1               ICON                    "..\\art\\icon256.ico"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,47,0
- PRODUCTVERSION 0,9,47,0
+ FILEVERSION 0,9,48,0
+ PRODUCTVERSION 0,9,48,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -51,10 +51,10 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
-            VALUE "FileVersion", "0.9.47.0"
+            VALUE "FileVersion", "0.9.48.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.47.0"
+            VALUE "ProductVersion", "0.9.48.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc
index 182787008..5a58c3a01 100644
--- a/Telegram/Resources/winrc/Updater.rc
+++ b/Telegram/Resources/winrc/Updater.rc
@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,9,47,0
- PRODUCTVERSION 0,9,47,0
+ FILEVERSION 0,9,48,0
+ PRODUCTVERSION 0,9,48,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -43,10 +43,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Telegram Messenger LLP"
             VALUE "FileDescription", "Telegram Updater"
-            VALUE "FileVersion", "0.9.47.0"
+            VALUE "FileVersion", "0.9.48.0"
             VALUE "LegalCopyright", "Copyright (C) 2014-2016"
             VALUE "ProductName", "Telegram Desktop"
-            VALUE "ProductVersion", "0.9.47.0"
+            VALUE "ProductVersion", "0.9.48.0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/Telegram/SourceFiles/core/version.h b/Telegram/SourceFiles/core/version.h
index 4f4c0a710..f220a893c 100644
--- a/Telegram/SourceFiles/core/version.h
+++ b/Telegram/SourceFiles/core/version.h
@@ -24,7 +24,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #define BETA_VERSION_MACRO (0ULL)
 
-constexpr int AppVersion = 9047;
-constexpr str_const AppVersionStr = "0.9.47";
-constexpr bool AppAlphaVersion = true;
+constexpr int AppVersion = 9048;
+constexpr str_const AppVersionStr = "0.9.48";
+constexpr bool AppAlphaVersion = false;
 constexpr uint64 AppBetaVersion = BETA_VERSION_MACRO;
diff --git a/Telegram/SourceFiles/localstorage.cpp b/Telegram/SourceFiles/localstorage.cpp
index 1aee7a285..33c94b4d4 100644
--- a/Telegram/SourceFiles/localstorage.cpp
+++ b/Telegram/SourceFiles/localstorage.cpp
@@ -2301,8 +2301,10 @@ namespace Local {
 
 			EncryptedDescriptor data(sizeof(quint64) + Serialize::stringSize(msgDraft.text) + 2 * sizeof(qint32) + Serialize::stringSize(editDraft.text) + 2 * sizeof(qint32));
 			data.stream << quint64(peer);
-			data.stream << msgDraft.text << qint32(msgDraft.msgId) << qint32(msgDraft.previewCancelled ? 1 : 0);
-			data.stream << editDraft.text << qint32(editDraft.msgId) << qint32(editDraft.previewCancelled ? 1 : 0);
+			data.stream << msgDraft.text << QByteArray();
+			data.stream << qint32(msgDraft.msgId) << qint32(msgDraft.previewCancelled ? 1 : 0);
+			data.stream << editDraft.text << QByteArray();
+			data.stream << qint32(editDraft.msgId) << qint32(editDraft.previewCancelled ? 1 : 0);
 
 			FileWriteDescriptor file(i.value());
 			file.writeEncrypted(data);
@@ -2371,14 +2373,22 @@ namespace Local {
 
 		quint64 draftPeer = 0;
 		QString msgText, editText;
+		QByteArray msgTagsSerialized, editTagsSerialized;
 		qint32 msgReplyTo = 0, msgPreviewCancelled = 0, editMsgId = 0, editPreviewCancelled = 0;
 		draft.stream >> draftPeer >> msgText;
+		if (draft.version >= 9048) {
+			draft.stream >> msgTagsSerialized;
+		}
 		if (draft.version >= 7021) {
 			draft.stream >> msgReplyTo;
 			if (draft.version >= 8001) {
 				draft.stream >> msgPreviewCancelled;
 				if (!draft.stream.atEnd()) {
-					draft.stream >> editText >> editMsgId >> editPreviewCancelled;
+					draft.stream >> editText;
+					if (draft.version >= 9048) {
+						draft.stream >> editTagsSerialized;
+					}
+					draft.stream >> editMsgId >> editPreviewCancelled;
 				}
 			}
 		}
diff --git a/Telegram/SourceFiles/ui/text/text_block.h b/Telegram/SourceFiles/ui/text/text_block.h
index e64547042..babc1f4f3 100644
--- a/Telegram/SourceFiles/ui/text/text_block.h
+++ b/Telegram/SourceFiles/ui/text/text_block.h
@@ -140,9 +140,9 @@ public:
 	TextWord() = default;
 	TextWord(uint16 from, QFixed width, QFixed rbearing, QFixed rpadding = 0)
 		: _from(from)
-		, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value()))
 		, _width(width)
-		, _rpadding(rpadding) {
+		, _rpadding(rpadding)
+		, _rbearing(rbearing.value() > 0x7FFF ? 0x7FFF : (rbearing.value() < -0x7FFF ? -0x7FFF : rbearing.value())) {
 	}
 	uint16 from() const {
 		return _from;
diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj
index 41b3df598..9bcf3780d 100644
--- a/Telegram/Telegram.xcodeproj/project.pbxproj
+++ b/Telegram/Telegram.xcodeproj/project.pbxproj
@@ -2023,7 +2023,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.47;
+				TDESKTOP_VERSION = 0.9.48;
 			};
 			name = Release;
 		};
@@ -2164,7 +2164,7 @@
 				SDKROOT = macosx;
 				SYMROOT = ./../Mac;
 				TDESKTOP_MAJOR_VERSION = 0.9;
-				TDESKTOP_VERSION = 0.9.47;
+				TDESKTOP_VERSION = 0.9.48;
 			};
 			name = Debug;
 		};
diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh
index e0b8af549..551412216 100755
--- a/Telegram/build/build.sh
+++ b/Telegram/build/build.sh
@@ -124,6 +124,9 @@ fi
 if [ "$BuildTarget" == "linux" ] || [ "$BuildTarget" == "linux32" ]; then
 
   DropboxSymbolsPath="/media/psf/Dropbox/Telegram/symbols"
+  if [ ! -d "$DropboxSymbolsPath" ]; then
+    Error "Dropbox path not found!"
+  fi
 
   mkdir -p "$WorkPath/ReleaseIntermediateUpdater"
   cd "$WorkPath/ReleaseIntermediateUpdater"
@@ -206,6 +209,9 @@ fi
 if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarget" == "macstore" ]; then
 
   DropboxSymbolsPath="/Volumes/Storage/Dropbox/Telegram/symbols"
+  if [ ! -d "$DropboxSymbolsPath" ]; then
+    Error "Dropbox path not found!"
+  fi
 
   if [ "$FastParam" != "fast" ]; then
     touch "./Resources/telegram.qrc"
@@ -279,7 +285,8 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ] || [ "$BuildTarg
   if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "mac32" ]; then
     if [ "$BetaVersion" == "0" ]; then
       cd "$ReleasePath"
-      temppath=`hdiutil attach -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
+      cp -f tsetup_blank.dmg tsetup.dmg
+      temppath=`hdiutil attach -nobrowse -noautoopenrw -readwrite tsetup.dmg | awk -F "\t" 'END {print $3}'`
       cp -R "./$BinaryName.app" "$temppath/"
       bless --folder "$temppath/" --openfolder "$temppath/"
       hdiutil detach "$temppath"
diff --git a/Telegram/build/version b/Telegram/build/version
index b2d958b19..0c657fd1c 100644
--- a/Telegram/build/version
+++ b/Telegram/build/version
@@ -1,6 +1,6 @@
-AppVersion         9047
+AppVersion         9048
 AppVersionStrMajor 0.9
-AppVersionStrSmall 0.9.47
-AppVersionStr      0.9.47
-AlphaChannel       1
+AppVersionStrSmall 0.9.48
+AppVersionStr      0.9.48
+AlphaChannel       0
 BetaVersion        0
diff --git a/doc/building-msvc.md b/doc/building-msvc.md
index 6427a5f0c..20b1c4f48 100644
--- a/doc/building-msvc.md
+++ b/doc/building-msvc.md
@@ -86,6 +86,7 @@ or download in ZIP and extract to **D:\TBuild\Libraries\**, rename **libexif-0.6
 Open **VS2015 x86 Native Tools Command Prompt.bat** (should be in **Start Menu > Programs > Visual Studio 2015** menu folder), go to **D:\\TBuild\\Libraries** and run
 
     git clone git://repo.or.cz/openal-soft.git
+    cd openal-soft
     git checkout 90349b38
     git apply ./../../tdesktop/Telegram/Patches/openal.diff
 
diff --git a/lib/xdg/telegramdesktop.desktop b/lib/xdg/telegramdesktop.desktop
index 2151d0ad4..35a5c61da 100644
--- a/lib/xdg/telegramdesktop.desktop
+++ b/lib/xdg/telegramdesktop.desktop
@@ -9,4 +9,4 @@ Terminal=false
 StartupWMClass=Telegram
 Type=Application
 Categories=Network;
-MimeType=application/x-xdg-protocol-tg;x-scheme-handler/tg;
+MimeType=x-scheme-handler/tg;