diff --git a/Telegram/Resources/lang.strings b/Telegram/Resources/lang.strings
index 078989e2f..3c0d0b6e0 100644
--- a/Telegram/Resources/lang.strings
+++ b/Telegram/Resources/lang.strings
@@ -421,12 +421,18 @@ Copyright (c) 2014 John Preston, https://desktop.telegram.org
 "lng_action_add_user" = "{from} added {user}";
 "lng_action_kick_user" = "{from} kicked {user}";
 "lng_action_user_left" = "{from} left the group";
+"lng_action_user_left_channel" = "{from} left the channel";
 "lng_action_user_joined" = "{from} joined the group";
+"lng_action_user_joined_channel" = "{from} joined the channel";
 "lng_action_user_joined_by_link" = "{from} joined the group via invite link";
+"lng_action_user_joined_by_link_channel" = "{from} joined the channel via invite link";
 "lng_action_user_registered" = "{from} just joined Telegram";
 "lng_action_removed_photo" = "{from} removed group photo";
+"lng_action_removed_photo_channel" = "Channel photo was removed";
 "lng_action_changed_photo" = "{from} changed group photo";
+"lng_action_changed_photo_channel" = "Channel photo was changed";
 "lng_action_changed_title" = "{from} changed group name to «{title}»";
+"lng_action_changed_title_channel" = "Channel name was changed to «{title}»";
 "lng_action_created_chat" = "{from} created group «{title}»";
 "lng_action_created_channel" = "Channel «{title}» created";
 
diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index 00852611c..90f299780 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -490,8 +490,8 @@ namespace App {
 				cdata->setPhoto(d.vphoto);
 				cdata->date = d.vdate.v;
 				cdata->count = d.vparticipants_count.v;
-				cdata->left = false;// d.vflags.v & MTPDchat... d.vleft.v;
-				cdata->forbidden = false;
+				cdata->left = (d.vflags.v & MTPDchat_flag_left);
+				cdata->forbidden = (d.vflags.v & MTPDchat_flag_kicked);
 				if (cdata->version < d.vversion.v) {
 					cdata->version = d.vversion.v;
 					cdata->participants = ChatData::Participants();
@@ -531,8 +531,11 @@ namespace App {
 				cdata->date = d.vdate.v;
 				cdata->adminned = (d.vflags.v & MTPDchannel_flag_is_admin);
 				
-				cdata->left = false;
-				cdata->forbidden = false;
+				cdata->isBroadcast = (d.vflags.v & MTPDchannel_flag_is_broadcast);
+				cdata->isPublic = (d.vflags.v & MTPDchannel_flag_is_public);
+
+				cdata->left = (d.vflags.v & MTPDchannel_flag_left);
+				cdata->forbidden = (d.vflags.v & MTPDchannel_flag_kicked);
 				if (cdata->version < d.vversion.v) {
 					cdata->version = d.vversion.v;
 				}
diff --git a/Telegram/SourceFiles/gui/scrollarea.cpp b/Telegram/SourceFiles/gui/scrollarea.cpp
index dbca10ff9..cc721bf81 100644
--- a/Telegram/SourceFiles/gui/scrollarea.cpp
+++ b/Telegram/SourceFiles/gui/scrollarea.cpp
@@ -671,6 +671,15 @@ void ScrollArea::updateColors(const style::color &bar, const style::color &bg, c
 	vert.update();
 }
 
+bool ScrollArea::focusNextPrevChild(bool next) {
+	if (QWidget::focusNextPrevChild(next)) {
+//		if (QWidget *fw = focusWidget())
+//			ensureWidgetVisible(fw);
+		return true;
+	}
+	return false;
+}
+
 ScrollArea::~ScrollArea() {
 	takeWidget();
 }
diff --git a/Telegram/SourceFiles/gui/scrollarea.h b/Telegram/SourceFiles/gui/scrollarea.h
index e88f5e9b1..208055057 100644
--- a/Telegram/SourceFiles/gui/scrollarea.h
+++ b/Telegram/SourceFiles/gui/scrollarea.h
@@ -132,6 +132,8 @@ public:
 
 	void updateColors(const style::color &bar, const style::color &bg, const style::color &barOver, const style::color &bgOver);
 
+	bool focusNextPrevChild(bool next);
+
 	~ScrollArea();
 
 public slots:
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 46d3e3b89..cf5ce629a 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -195,7 +195,7 @@ void DialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const {
 		p.drawText(rectForName.left() + rectForName.width() + st::dlgDateSkip, rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, dt);
 
 		// draw check
-		if (last->out() && last->needCheck()) {
+		if (last->needCheck()) {
 			const style::sprite *check;
 			if (last->id > 0) {
 				if (last->unread()) {
@@ -277,7 +277,7 @@ void FakeDialogRow::paint(QPainter &p, int32 w, bool act, bool sel) const {
 	p.drawText(rectForName.left() + rectForName.width() + st::dlgDateSkip, rectForName.top() + st::msgNameFont->height - st::msgDateFont->descent, dt);
 
 	// draw check
-	if (_item->out() && _item->needCheck()) {
+	if (_item->needCheck()) {
 		const style::sprite *check;
 		if (_item->id > 0) {
 			if (_item->unread()) {
@@ -803,10 +803,10 @@ HistoryItem *History::createItem(HistoryBlock *block, const MTPmessage &msg, boo
 	return regItem(result, returnExisting);
 }
 
-HistoryItem *History::createItemForwarded(HistoryBlock *block, MsgId id, HistoryMessage *msg) {
+HistoryItem *History::createItemForwarded(HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg) {
 	HistoryItem *result = 0;
 
-	result = new HistoryForwarded(this, block, id, msg);
+	result = new HistoryForwarded(this, block, id, date, from, msg);
 
 	return regItem(result);
 }
@@ -850,7 +850,7 @@ HistoryItem *History::addToHistory(const MTPmessage &msg) {
 	return createItem(0, msg, false, true);
 }
 
-HistoryItem *History::addToBackForwarded(MsgId id, HistoryMessage *item) {
+HistoryItem *History::addToBackForwarded(MsgId id, QDateTime date, int32 from, HistoryMessage *item) {
 	HistoryBlock *to = 0;
 	bool newBlock = isEmpty();
 	if (newBlock) {
@@ -858,7 +858,7 @@ HistoryItem *History::addToBackForwarded(MsgId id, HistoryMessage *item) {
 	} else {
 		to = back();
 	}
-	return doAddToBack(to, newBlock, createItemForwarded(to, id, item), true);
+	return doAddToBack(to, newBlock, createItemForwarded(to, id, date, from, item), true);
 }
 
 HistoryItem *History::addToBackDocument(MsgId id, int32 flags, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc) {
@@ -945,9 +945,10 @@ HistoryItem *History::doAddToBack(HistoryBlock *to, bool newBlock, HistoryItem *
 		HistoryMediaType mt = media->type();
 		MediaOverviewType t = mediaToOverviewType(mt);
 		if (t != OverviewCount) {
-			addToOverview(adding, t);
 			if (mt == MediaTypeDocument && static_cast<HistoryDocument*>(media)->document()->song()) {
 				addToOverview(adding, OverviewAudioDocuments);
+			} else {
+				addToOverview(adding, t);
 			}
 		}
 	}
@@ -1097,9 +1098,10 @@ void History::addToFront(const QVector<MTPMessage> &slice) {
 					HistoryMediaType mt = media->type();
 					MediaOverviewType t = mediaToOverviewType(mt);
 					if (t != OverviewCount) {
-						if (addToOverviewFront(item, t)) mask |= (1 << t);
 						if (mt == MediaTypeDocument && static_cast<HistoryDocument*>(media)->document()->song()) {
 							if (addToOverviewFront(item, OverviewAudioDocuments)) mask |= (1 << OverviewAudioDocuments);
+						} else {
+							if (addToOverviewFront(item, t)) mask |= (1 << t);
 						}
 					}
 				}
@@ -1244,11 +1246,6 @@ void History::addToBack(const QVector<MTPMessage> &slice) {
 					HistoryMediaType mt = media->type();
 					MediaOverviewType t = mediaToOverviewType(mt);
 					if (t != OverviewCount) {
-						if (_overviewCount[t] != 0) {
-							_overview[t].push_back(item->id);
-							_overviewIds[t].insert(item->id, NullType());
-							mask |= (1 << t);
-						}
 						if (mt == MediaTypeDocument && static_cast<HistoryDocument*>(media)->document()->song()) {
 							t = OverviewAudioDocuments;
 							if (_overviewCount[t] != 0) {
@@ -1256,6 +1253,12 @@ void History::addToBack(const QVector<MTPMessage> &slice) {
 								_overviewIds[t].insert(item->id, NullType());
 								mask |= (1 << t);
 							}
+						} else {
+							if (_overviewCount[t] != 0) {
+								_overview[t].push_back(item->id);
+								_overviewIds[t].insert(item->id, NullType());
+								mask |= (1 << t);
+							}
 						}
 					}
 				}
@@ -1737,7 +1740,7 @@ void HistoryBlock::removeItem(HistoryItem *item) {
 	dh = item->height();
 	remove(i);
 	int32 l = size();
-	if (!item->out() && item->unread() && history->unreadCount) {
+	if ((!item->out() || item->fromChannel()) && item->unread() && history->unreadCount) {
 		history->setUnreadCount(history->unreadCount - 1);
 	}
 	int32 itemType = item->itemType();
@@ -1820,9 +1823,10 @@ void HistoryItem::destroy() {
 	HistoryMedia *m = getMedia(true);
 	MediaOverviewType t = m ? mediaToOverviewType(m->type()) : OverviewCount;
 	if (t != OverviewCount) {
-		history()->eraseFromOverview(t, id);
 		if (m->type() == MediaTypeDocument && static_cast<HistoryDocument*>(m)->document()->song()) {
 			history()->eraseFromOverview(OverviewAudioDocuments, id);
+		} else {
+			history()->eraseFromOverview(t, id);
 		}
 	}
 	if (hasTextLinks()) {
@@ -2067,7 +2071,8 @@ void HistoryPhoto::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x
 		if (_caption.isEmpty()) {
 			int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x();
 			int32 dateY = skipy + height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y();
-			if (parent->out()) {
+			if (parent->fromChannel()) {
+			} else if (parent->out()) {
 				dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 			}
 			bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y);
@@ -2120,16 +2125,16 @@ void HistoryPhoto::updateFrom(const MTPMessageMedia &media) {
 void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, int32 width) const {
 	const HistoryReply *reply = toHistoryReply(parent);
 	const HistoryForwarded *fwd = reply ? 0 : toHistoryForwarded(parent);
-	bool out = parent->out();
+	bool fromChannel = parent->fromChannel(), out = parent->out(), outbg = out && !fromChannel;
 
 	if (width < 0) width = w;
 	int skipx = 0, skipy = 0, height = _height;
 	if (reply || !_caption.isEmpty()) {
 		skipx = st::mediaPadding.left();
 
-		style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-		style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-		RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+		style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+		style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+		RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 		App::roundRect(p, 0, 0, width, _height, bg, cors, &sh);
 
 		int replyFrom = 0, fwdFrom = 0;
@@ -2200,7 +2205,8 @@ void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		if (time.isEmpty()) return;
 		int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x();
 		int32 dateY = skipy + height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta;
-		if (parent->out()) {
+		if (fromChannel) {
+		} else if (out) {
 			dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 		}
 		int32 dateW = skipx + width - dateX - st::msgDateImgDelta;
@@ -2211,7 +2217,8 @@ void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		p.setFont(st::msgDateFont->f);
 		p.setPen(st::msgDateImgColor->p);
 		p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time);
-		if (out) {
+		if (fromChannel) {
+		} else if (out) {
 			QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2);
 			const QRect *iconRect;
 			if (parent->id > 0) {
@@ -2229,11 +2236,12 @@ void HistoryPhoto::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		p.setPen(st::black->p);
 		_caption.draw(p, skipx, skipy + height + st::webPagePhotoSkip, width);
 
-		style::color date(selected ? (out ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out ? st::msgOutDateColor : st::msgInDateColor));
+		style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 		p.setPen(date->p);
 
 		p.drawText(w - st::msgPadding.right() + st::msgDateDelta.x() - parent->timeWidth(true) + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, time);
-		if (out) {
+		if (fromChannel) {
+		} else if (out) {
 			QPoint iconPos(w + st::msgCheckPos.x() - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + st::msgCheckPos.y() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 			const QRect *iconRect;
 			if (parent->id > 0) {
@@ -2334,7 +2342,7 @@ HistoryVideo::HistoryVideo(const MTPDvideo &video, const QString &caption, Histo
 void HistoryVideo::initDimensions(const HistoryItem *parent) {
 	_maxw = st::mediaMaxWidth;
 	int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right();
-	if (!parent->out()) { // add Download / Save As button
+	if (!parent->out() || parent->fromChannel()) { // add Download / Save As button
 		_maxw += st::mediaSaveDelta + _buttonWidth;
 	}
 	_minh = st::mediaPadding.top() + st::mediaThumbSize + st::mediaPadding.bottom();
@@ -2407,7 +2415,8 @@ int32 HistoryVideo::countHeight(const HistoryItem *parent, int32 width) const {
 	}
 	if (!_caption.isEmpty()) {
 		int32 textw = width - st::mediaPadding.left() - st::mediaPadding.right();
-		if (!parent->out()) { // substract Download / Save As button
+		bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+		if (!outbg) { // substract Download / Save As button
 			textw -= st::mediaSaveDelta + _buttonWidth;
 		}
 		h += st::webPagePhotoSkip + _caption.countHeight(textw);
@@ -2441,12 +2450,12 @@ void HistoryVideo::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x
 		skipy += fwdFrom;
 	}
 
-	bool out = parent->out(), hovered, pressed;
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
 	if (width >= _maxw) {
 		width = _maxw;
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		int32 h = height;
 		if (!_caption.isEmpty()) {
 			h -= st::webPagePhotoSkip + _caption.countHeight(width - _buttonWidth - st::mediaSaveDelta - st::mediaPadding.left() - st::mediaPadding.right());
@@ -2527,12 +2536,12 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 
 	data->thumb->checkload();
 
-	bool out = parent->out(), hovered, pressed;
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
 	if (width >= _maxw) {
 		width = _maxw;
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		hovered = ((data->loader ? _cancell : _savel) == textlnkOver());
 		pressed = hovered && ((data->loader ? _cancell : _savel) == textlnkDown());
 		if (hovered && !pressed && textlnkDown()) hovered = false;
@@ -2556,9 +2565,9 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		width -= btnw + st::mediaSaveDelta;
 	}
 
-	style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-	style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-	RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+	style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+	style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+	RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 	App::roundRect(p, 0, 0, width, height, bg, cors, &sh);
 
 	if (parent->displayFromName()) {
@@ -2575,7 +2584,7 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 	if (_thumbw) {
 		p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), data->thumb->pixSingle(_thumbw, 0, st::mediaThumbSize, st::mediaThumbSize));
 	} else {
-		p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), (out ? st::mediaDocOutImg : st::mediaDocInImg));
+		p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), (outbg ? st::mediaDocOutImg : st::mediaDocInImg));
 	}
 	if (selected) {
 		App::roundRect(p, st::mediaPadding.left(), skipy + st::mediaPadding.top(), st::mediaThumbSize, st::mediaThumbSize, textstyleCurrent()->selectOverlay, SelectedOverlayCorners);
@@ -2592,7 +2601,7 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 
 	QString statusText;
 
-	style::color status(selected ? (out ? st::mediaOutSelectColor : st::mediaInSelectColor) : (out ? st::mediaOutColor : st::mediaInColor));
+	style::color status(selected ? (outbg ? st::mediaOutSelectColor : st::mediaInSelectColor) : (outbg ? st::mediaOutColor : st::mediaInColor));
 	p.setPen(status->p);
 
 	if (data->loader) {
@@ -2622,7 +2631,7 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= twidth) {
 			p.setRenderHint(QPainter::HighQualityAntialiasing, true);
 			p.setPen(Qt::NoPen);
-			p.setBrush((out ? (selected ? st::mediaOutUnreadSelectColor : st::mediaOutUnreadColor) : (selected ? st::mediaInUnreadSelectColor : st::mediaInUnreadColor))->b);
+			p.setBrush((outbg ? (selected ? st::mediaOutUnreadSelectColor : st::mediaOutUnreadColor) : (selected ? st::mediaInUnreadSelectColor : st::mediaInUnreadColor))->b);
 			p.drawEllipse(QRect(tleft + w + st::mediaUnreadSkip, texty + ((st::mediaFont->height - st::mediaUnreadSize) / 2), st::mediaUnreadSize, st::mediaUnreadSize));
 			p.setRenderHint(QPainter::HighQualityAntialiasing, false);
 		}
@@ -2634,11 +2643,11 @@ void HistoryVideo::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		_caption.draw(p, st::mediaPadding.left(), skipy + st::mediaPadding.top() + st::mediaThumbSize + st::webPagePhotoSkip, width - st::mediaPadding.left() - st::mediaPadding.right());
 	}
 
-	style::color date(selected ? (out ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out ? st::msgOutDateColor : st::msgInDateColor));
+	style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 	p.setPen(date->p);
 
 	p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time());
-	if (out) {
+	if (outbg) {
 		QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -2672,7 +2681,8 @@ int32 HistoryVideo::resize(int32 width, const HistoryItem *parent) {
 	}
 	if (!_caption.isEmpty()) {
 		int32 textw = w - st::mediaPadding.left() - st::mediaPadding.right();
-		if (!parent->out()) { // substract Download / Save As button
+		bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+		if (!outbg) { // substract Download / Save As button
 			textw -= st::mediaSaveDelta + _buttonWidth;
 		}
 		_height += st::webPagePhotoSkip + _caption.countHeight(textw);
@@ -2715,7 +2725,8 @@ HistoryAudio::HistoryAudio(const MTPDaudio &audio) : HistoryMedia()
 void HistoryAudio::initDimensions(const HistoryItem *parent) {
 	_maxw = st::mediaMaxWidth;
 	int32 tleft = st::mediaPadding.left() + st::mediaThumbSize + st::mediaPadding.right();
-	if (!parent->out()) { // add Download / Save As button
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+	if (!outbg) { // add Download / Save As button
 		_maxw += st::mediaSaveDelta + _buttonWidth;
 	}
 
@@ -2755,7 +2766,8 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		skipy += fwdFrom;
 	}
 
-	bool out = parent->out(), hovered, pressed, already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
+	bool already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
 	if (width >= _maxw) {
 		width = _maxw;
 	}
@@ -2764,7 +2776,7 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		data->save(QString());
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		hovered = ((data->loader ? _cancell : _savel) == textlnkOver());
 		pressed = hovered && ((data->loader ? _cancell : _savel) == textlnkDown());
 		if (hovered && !pressed && textlnkDown()) hovered = false;
@@ -2783,9 +2795,9 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		width -= btnw + st::mediaSaveDelta;
 	}
 
-	style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-	style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-	RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+	style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+	style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+	RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 	App::roundRect(p, 0, 0, width, _height, bg, cors, &sh);
 
 	if (parent->displayFromName()) {
@@ -2811,14 +2823,14 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 	QString statusText;
 	if (data->status == FileFailed) {
 		statusText = lang(lng_attach_failed);
-		img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+		img = outbg ? st::mediaAudioOutImg : st::mediaAudioInImg;
 	} else if (data->status == FileUploading) {
 		if (_uplTextCache.isEmpty() || _uplDone != data->uploadOffset) {
 			_uplDone = data->uploadOffset;
 			_uplTextCache = formatDownloadText(_uplDone, data->size);
 		}
 		statusText = _uplTextCache;
-		img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+		img = outbg ? st::mediaAudioOutImg : st::mediaAudioInImg;
 	} else if (already || hasdata) {
 		bool showPause = false;
 		if (playing.msgId == parent->fullId() && !(playingState & AudioPlayerStoppedMask) && playingState != AudioPlayerFinishing) {
@@ -2827,7 +2839,7 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		} else {
 			statusText = formatDurationText(data->duration);
 		}
-		img = out ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
+		img = outbg ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
 	} else {
 		if (data->loader) {
 			int32 offset = data->loader->currentOffset();
@@ -2839,7 +2851,7 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		} else {
 			statusText = _size;
 		}
-		img = out ? st::mediaAudioOutImg : st::mediaAudioInImg;
+		img = outbg ? st::mediaAudioOutImg : st::mediaAudioInImg;
 	}
 
 	p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), img);
@@ -2856,7 +2868,7 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 	p.setPen(st::black->c);
 	p.drawText(tleft, skipy + st::mediaPadding.top() + st::mediaNameTop + st::mediaFont->ascent, lang(lng_media_audio));
 
-	style::color status(selected ? (out ? st::mediaOutSelectColor : st::mediaInSelectColor) : (out ? st::mediaOutColor : st::mediaInColor));
+	style::color status(selected ? (outbg ? st::mediaOutSelectColor : st::mediaInSelectColor) : (outbg ? st::mediaOutColor : st::mediaInColor));
 	p.setPen(status->p);
 	int32 texty = skipy + st::mediaPadding.top() + st::mediaThumbSize - st::mediaDetailsShift - st::mediaFont->height;
 	p.drawText(tleft, texty + st::mediaFont->ascent, statusText);
@@ -2865,18 +2877,19 @@ void HistoryAudio::draw(QPainter &p, const HistoryItem *parent, bool selected, i
 		if (w + st::mediaUnreadSkip + st::mediaUnreadSize <= twidth) {
 			p.setRenderHint(QPainter::HighQualityAntialiasing, true);
 			p.setPen(Qt::NoPen);
-			p.setBrush((out ? (selected ? st::mediaOutUnreadSelectColor : st::mediaOutUnreadColor) : (selected ? st::mediaInUnreadSelectColor : st::mediaInUnreadColor))->b);
+			p.setBrush((outbg ? (selected ? st::mediaOutUnreadSelectColor : st::mediaOutUnreadColor) : (selected ? st::mediaInUnreadSelectColor : st::mediaInUnreadColor))->b);
 			p.drawEllipse(QRect(tleft + w + st::mediaUnreadSkip, texty + ((st::mediaFont->height - st::mediaUnreadSize) / 2), st::mediaUnreadSize, st::mediaUnreadSize));
 			p.setRenderHint(QPainter::HighQualityAntialiasing, false);
 		}
 	}
 	p.setFont(st::msgDateFont->f);
 
-	style::color date(selected ? (out ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out ? st::msgOutDateColor : st::msgInDateColor));
+	style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 	p.setPen(date->p);
 
 	p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time());
-	if (out) {
+	if (fromChannel) {
+	} else if (out) {
 		QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -2946,12 +2959,12 @@ void HistoryAudio::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x
 		skipy += fwdFrom;
 	}
 
-	bool out = parent->out(), hovered, pressed;
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
 	if (width >= _maxw) {
 		width = _maxw;
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		int32 btnw = _buttonWidth, btnh = st::mediaSaveButton.height, btnx = width - _buttonWidth, btny = skipy + (_height - skipy - btnh) / 2;
 		if (x >= btnx && y >= btny && x < btnx + btnw && y < btny + btnh) {
 			lnk = data->loader ? _cancell : _savel;
@@ -3047,7 +3060,8 @@ void HistoryDocument::initDimensions(const HistoryItem *parent) {
 		if (_namew + tleft + st::mediaPadding.right() > _maxw) {
 			_maxw = _namew + tleft + st::mediaPadding.right();
 		}
-		if (!parent->out()) { // add Download / Save As button
+		bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+		if (!outbg) { // add Download / Save As button
 			_maxw += st::mediaSaveDelta + _buttonWidth;
 		}
 		_minh = st::mediaPadding.top() + st::mediaThumbSize + st::mediaPadding.bottom();
@@ -3073,7 +3087,8 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 	if (width < 0) width = w;
 	if (width < 1) return;
 
-	bool out = parent->out(), hovered, pressed, already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
+	bool already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
 	if (parent == animated.msg) {
 		int32 pw = animated.w / cIntRetinaFactor(), ph = animated.h / cIntRetinaFactor();
 		if (width < pw) {
@@ -3112,7 +3127,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 		width = _maxw;
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		hovered = ((data->loader ? _cancell : _savel) == textlnkOver());
 		pressed = hovered && ((data->loader ? _cancell : _savel) == textlnkDown());
 		if (hovered && !pressed && textlnkDown()) hovered = false;
@@ -3131,9 +3146,9 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 		width -= btnw + st::mediaSaveDelta;
 	}
 
-	style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-	style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-	RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+	style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+	style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+	RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 	App::roundRect(p, 0, 0, width, _height, bg, cors, &sh);
 
 	if (parent->displayFromName()) {
@@ -3160,14 +3175,14 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 		QRect img;
 		if (data->status == FileFailed) {
 			statusText = lang(lng_attach_failed);
-			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
+			img = outbg ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		} else if (data->status == FileUploading) {
 			if (_uplTextCache.isEmpty() || _uplDone != data->uploadOffset) {
 				_uplDone = data->uploadOffset;
 				_uplTextCache = formatDownloadText(_uplDone, data->size);
 			}
 			statusText = _uplTextCache;
-			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
+			img = outbg ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		} else if (already || hasdata) {
 			bool showPause = false;
 			if (playing.msgId == parent->fullId() && !(playingState & AudioPlayerStoppedMask) && playingState != AudioPlayerFinishing) {
@@ -3177,7 +3192,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 				statusText = formatDurationText(data->song()->duration);
 			}
 			if (!showPause && playing.msgId == parent->fullId() && App::main() && App::main()->player()->seekingSong(playing)) showPause = true;
-			img = out ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
+			img = outbg ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
 		} else {
 			if (data->loader) {
 				int32 offset = data->loader->currentOffset();
@@ -3189,7 +3204,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 			} else {
 				statusText = _size;
 			}
-			img = out ? st::mediaMusicOutImg : st::mediaMusicInImg;
+			img = outbg ? st::mediaMusicOutImg : st::mediaMusicInImg;
 		}
 
 		p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), img);
@@ -3217,7 +3232,7 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 			data->thumb->checkload();
 			p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), data->thumb->pixSingle(_thumbw, 0, st::mediaThumbSize, st::mediaThumbSize));
 		} else {
-			p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), (out ? st::mediaDocOutImg : st::mediaDocInImg));
+			p.drawPixmap(QPoint(st::mediaPadding.left(), skipy + st::mediaPadding.top()), App::sprite(), (outbg ? st::mediaDocOutImg : st::mediaDocInImg));
 		}
 	}
 	if (selected) {
@@ -3237,18 +3252,19 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 		p.drawText(tleft, skipy + st::mediaPadding.top() + st::mediaNameTop + st::mediaFont->ascent, _name);
 	}
 
-	style::color status(selected ? (out ? st::mediaOutSelectColor : st::mediaInSelectColor) : (out ? st::mediaOutColor : st::mediaInColor));
+	style::color status(selected ? (outbg ? st::mediaOutSelectColor : st::mediaInSelectColor) : (outbg ? st::mediaOutColor : st::mediaInColor));
 	p.setPen(status->p);
 
 	p.drawText(tleft, skipy + st::mediaPadding.top() + st::mediaThumbSize - st::mediaDetailsShift - st::mediaFont->descent, statusText);
 
 	p.setFont(st::msgDateFont->f);
 
-	style::color date(selected ? (out ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out ? st::msgOutDateColor : st::msgInDateColor));
+	style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 	p.setPen(date->p);
 
 	p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time());
-	if (out) {
+	if (fromChannel) {
+	} else if (out) {
 		QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -3265,7 +3281,8 @@ void HistoryDocument::draw(QPainter &p, const HistoryItem *parent, bool selected
 }
 
 void HistoryDocument::drawInPlaylist(QPainter &p, const HistoryItem *parent, bool selected, bool over, int32 width) const {
-	bool out = parent->out(), already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+	bool already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
 	int32 height = st::mediaPadding.top() + st::mediaThumbSize + st::mediaPadding.bottom();
 
 	style::color bg(selected ? st::msgInSelectBg : (over ? st::playlistHoverBg : st::msgInBg));
@@ -3443,7 +3460,7 @@ void HistoryDocument::getState(TextLinkPtr &lnk, HistoryCursorState &state, int3
 	if (width < 0) width = w;
 	if (width < 1) return;
 
-	bool out = parent->out(), hovered, pressed;
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
 	if (width >= _maxw) {
 		width = _maxw;
 	}
@@ -3471,7 +3488,7 @@ void HistoryDocument::getState(TextLinkPtr &lnk, HistoryCursorState &state, int3
 		skipy += fwdFrom;
 	}
 
-	if (!out) { // draw Download / Save As button
+	if (!outbg) { // draw Download / Save As button
 		int32 btnw = _buttonWidth, btnh = st::mediaSaveButton.height, btnx = width - _buttonWidth, btny = skipy + (_height - skipy - btnh) / 2;
 		if (x >= btnx && y >= btny && x < btnx + btnw && y < btny + btnh) {
 			lnk = data->loader ? _cancell : _savel;
@@ -3555,16 +3572,19 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected,
 	if (width < 1) return;
 	if (width > _maxw) width = _maxw;
 
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel, hovered, pressed;
+	bool already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
+
 	int32 usew = _maxw, usex = 0;
 	const HistoryReply *reply = toHistoryReply(parent);
 	if (reply) {
 		usew -= st::msgReplyPadding.left() + reply->replyToWidth();
-		if (parent->out()) {
+		if (fromChannel) {
+		} else if (out) {
 			usex = width - usew;
 		}
 	}
 
-	bool out = parent->out(), hovered, pressed, already = !data->already().isEmpty(), hasdata = !data->data.isEmpty();
 	if (!data->loader && data->status != FileFailed && !already && !hasdata) {
 		data->save(QString());
 	}
@@ -3594,7 +3614,8 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected,
 	if (time.isEmpty()) return;
 	int32 dateX = usex + usew - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x();
 	int32 dateY = _height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta;
-	if (parent->out()) {
+	if (fromChannel) {
+	} else if (out) {
 		dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 	}
 	int32 dateW = usex + usew - dateX - st::msgDateImgDelta;
@@ -3605,7 +3626,8 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected,
 	p.setFont(st::msgDateFont->f);
 	p.setPen(st::msgDateImgColor->p);
 	p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time);
-	if (out) {
+	if (fromChannel) {
+	} else if (out) {
 		QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2);
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -3622,7 +3644,7 @@ void HistorySticker::draw(QPainter &p, const HistoryItem *parent, bool selected,
 
 	if (reply) {
 		int32 rw = width - usew - st::msgReplyPadding.left(), rh = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
-		int32 rx = parent->out() ? 0 : (usew + st::msgReplyPadding.left()), ry = _height - rh;
+		int32 rx = fromChannel ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left())), ry = _height - rh;
 		
 		App::roundRect(p, rx, ry, rw, rh, selected ? App::msgServiceSelectBg() : App::msgServiceBg(), selected ? ServiceSelectedCorners : ServiceCorners);
 
@@ -3675,16 +3697,19 @@ void HistorySticker::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
 
 	if (width > _maxw) width = _maxw;
 
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+
 	int32 usew = _maxw, usex = 0;
 	const HistoryReply *reply = toHistoryReply(parent);
 	if (reply) {
 		usew -= reply->replyToWidth();
-		if (parent->out()) {
+		if (fromChannel) {
+		} else if (out) {
 			usex = width - usew;
 		}
 
 		int32 rw = width - usew, rh = st::msgReplyPadding.top() + st::msgReplyBarSize.height() + st::msgReplyPadding.bottom();
-		int32 rx = parent->out() ? 0 : usew, ry = _height - rh;
+		int32 rx = fromChannel ? (usew + st::msgReplyPadding.left()) : (out ? 0 : (usew + st::msgReplyPadding.left())), ry = _height - rh;
 		if (x >= rx && y >= ry && x < rx + rw && y < ry + rh) {
 			lnk = reply->replyToLink();
 			return;
@@ -3692,7 +3717,8 @@ void HistorySticker::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
 	}
 	int32 dateX = usex + usew - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x();
 	int32 dateY = _height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y();
-	if (parent->out()) {
+	if (fromChannel) {
+	} else if (out) {
 		dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 	}
 	bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y);
@@ -3834,14 +3860,14 @@ void HistoryContact::draw(QPainter &p, const HistoryItem *parent, bool selected,
 		skipy += fwdFrom;
 	}
 
-	bool out = parent->out();
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
 	if (width >= _maxw) {
 		width = _maxw;
 	}
 
-	style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-	style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-	RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+	style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+	style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+	RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 	App::roundRect(p, 0, 0, width, _height, bg, cors, &sh);
 
 	if (parent->displayFromName()) {
@@ -3873,18 +3899,19 @@ void HistoryContact::draw(QPainter &p, const HistoryItem *parent, bool selected,
 		p.drawText(tleft, skipy + st::mediaPadding.top() + st::mediaNameTop + st::mediaFont->ascent, phone);
 	}
 
-	style::color status(selected ? (out ? st::mediaOutSelectColor : st::mediaInSelectColor) : (out ? st::mediaOutColor : st::mediaInColor));
+	style::color status(selected ? (outbg ? st::mediaOutSelectColor : st::mediaInSelectColor) : (outbg ? st::mediaOutColor : st::mediaInColor));
 	p.setPen(status->p);
 
 	name.drawElided(p, tleft, skipy + st::mediaPadding.top() + st::mediaThumbSize - st::mediaDetailsShift - st::mediaFont->height, secondwidth);
 
 	p.setFont(st::msgDateFont->f);
 
-	style::color date(selected ? (out ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out ? st::msgOutDateColor : st::msgInDateColor));
+	style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 	p.setPen(date->p);
 
 	p.drawText(width + st::msgDateDelta.x() - fullTimeWidth + st::msgDateSpace, _height - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, parent->time());
-	if (out) {
+	if (fromChannel) {
+	} else if (out) {
 		QPoint iconPos(width + 5 - st::msgPadding.right() - st::msgCheckRect.pxWidth(), _height + 1 - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -4088,9 +4115,11 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 		}
 	}
 
-	style::color bar = (selected ? (parent->out() ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (parent->out() ? st::msgOutReplyBarColor : st::msgInReplyBarColor));
-	style::color semibold = (selected ? (parent->out() ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (parent->out() ? st::msgOutServiceColor : st::msgInServiceColor));
-	style::color regular = (selected ? (parent->out() ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (parent->out() ? st::msgOutDateColor : st::msgInDateColor));
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+
+	style::color bar = (selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor));
+	style::color semibold = (selected ? (outbg ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (outbg ? st::msgOutServiceColor : st::msgInServiceColor));
+	style::color regular = (selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 	p.fillRect(0, 0, st::webPageBar, _height - bottomSkip, bar->b);
 
 	//if (data->pendingTill) {
@@ -4108,7 +4137,6 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 	if (_asArticle) {
 		int32 pixwidth = st::webPagePhotoSize, pixheight = st::webPagePhotoSize;
 		data->photo->medium->load(false, false);
-		bool out = parent->out();
 		bool full = data->photo->medium->loaded();
 		QPixmap pix;
 		if (full) {
@@ -4173,7 +4201,6 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 
 		int32 pixwidth = qMax(_pixw, int16(st::minPhotoSize)), pixheight = qMax(_pixh, int16(st::minPhotoSize));
 		data->photo->full->load(false, false);
-		bool out = parent->out();
 		bool full = data->photo->full->loaded();
 		QPixmap pix;
 		if (full) {
@@ -4253,7 +4280,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 				QRect img;
 				if (data->doc->status == FileFailed) {
 					statusText = lang(lng_attach_failed);
-					img = parent->out() ? st::mediaMusicOutImg : st::mediaMusicInImg;
+					img = outbg ? st::mediaMusicOutImg : st::mediaMusicInImg;
 				} else if (already || hasdata) {
 					bool showPause = false;
 					if (playing.msgId == parent->fullId() && !(playingState & AudioPlayerStoppedMask) && playingState != AudioPlayerFinishing) {
@@ -4263,7 +4290,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 						statusText = formatDurationText(data->doc->song()->duration);
 					}
 					if (!showPause && playing.msgId == parent->fullId() && App::main() && App::main()->player()->seekingSong(playing)) showPause = true;
-					img = parent->out() ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
+					img = outbg ? (showPause ? st::mediaPauseOutImg : st::mediaPlayOutImg) : (showPause ? st::mediaPauseInImg : st::mediaPlayInImg);
 				} else {
 					if (data->doc->loader) {
 						int32 offset = data->doc->loader->currentOffset();
@@ -4275,7 +4302,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 					} else {
 						statusText = _docSize;
 					}
-					img = parent->out() ? st::mediaMusicOutImg : st::mediaMusicInImg;
+					img = outbg ? st::mediaMusicOutImg : st::mediaMusicInImg;
 				}
 
 				p.drawPixmap(QPoint(0, 0), App::sprite(), img);
@@ -4297,7 +4324,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 					data->doc->thumb->checkload();
 					p.drawPixmap(QPoint(0, 0), data->doc->thumb->pixSingle(_docThumbWidth, 0, st::mediaThumbSize, st::mediaThumbSize));
 				} else {
-					p.drawPixmap(QPoint(0, 0), App::sprite(), (parent->out() ? st::mediaDocOutImg : st::mediaDocInImg));
+					p.drawPixmap(QPoint(0, 0), App::sprite(), (outbg ? st::mediaDocOutImg : st::mediaDocInImg));
 				}
 			}
 			if (selected) {
@@ -4317,7 +4344,7 @@ void HistoryWebPage::draw(QPainter &p, const HistoryItem *parent, bool selected,
 				p.drawText(tleft, st::mediaNameTop + st::mediaFont->ascent, _docName);
 			}
 
-			style::color status(selected ? (parent->out() ? st::mediaOutSelectColor : st::mediaInSelectColor) : (parent->out() ? st::mediaOutColor : st::mediaInColor));
+			style::color status(selected ? (outbg ? st::mediaOutSelectColor : st::mediaInSelectColor) : (outbg ? st::mediaOutColor : st::mediaInColor));
 			p.setPen(status->p);
 
 			p.drawText(tleft, st::mediaThumbSize - st::mediaDetailsShift - st::mediaFont->descent, statusText);
@@ -5002,14 +5029,14 @@ void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selecte
 	int skipx = 0, skipy = 0, height = _height;
 	const HistoryReply *reply = toHistoryReply(parent);
 	const HistoryForwarded *fwd = toHistoryForwarded(parent);
-	bool out = parent->out();
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
 
 	if (reply || !_title.isEmpty() || !_description.isEmpty()) {
 		skipx = st::mediaPadding.left();
 
-		style::color bg(selected ? (out ? st::msgOutSelectBg : st::msgInSelectBg) : (out ? st::msgOutBg : st::msgInBg));
-		style::color sh(selected ? (out ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out ? st::msgOutShadow : st::msgInShadow));
-		RoundCorners cors(selected ? (out ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out ? MessageOutCorners : MessageInCorners));
+		style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+		style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+		RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 		App::roundRect(p, 0, 0, width, _height, bg, cors, &sh);
 
 		int replyFrom = 0, fwdFrom = 0;
@@ -5099,7 +5126,8 @@ void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selecte
 	if (time.isEmpty()) return;
 	int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - 2 * st::msgDateImgPadding.x();
 	int32 dateY = skipy + height - st::msgDateFont->height - 2 * st::msgDateImgPadding.y() - st::msgDateImgDelta;
-	if (parent->out()) {
+	if (fromChannel) {
+	} else if (out) {
 		dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 	}
 	int32 dateW = skipx + width - dateX - st::msgDateImgDelta;
@@ -5110,7 +5138,8 @@ void HistoryImageLink::draw(QPainter &p, const HistoryItem *parent, bool selecte
 	p.setFont(st::msgDateFont->f);
 	p.setPen(st::msgDateImgColor->p);
 	p.drawText(dateX + st::msgDateImgPadding.x(), dateY + st::msgDateImgPadding.y() + st::msgDateFont->ascent, time);
-	if (out) {
+	if (fromChannel) {
+	} else if (out) {
 		QPoint iconPos(dateX - 2 + dateW - st::msgDateImgCheckSpace - st::msgCheckRect.pxWidth(), dateY + (dateH - st::msgCheckRect.pxHeight()) / 2);
 		const QRect *iconRect;
 		if (parent->id > 0) {
@@ -5216,6 +5245,9 @@ bool HistoryImageLink::hasPoint(int32 x, int32 y, const HistoryItem *parent, int
 
 void HistoryImageLink::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x, int32 y, const HistoryItem *parent, int32 width) const {
 	if (width < 0) width = w;
+
+	bool out = parent->out(), fromChannel = parent->fromChannel(), outbg = out && !fromChannel;
+
 	int skipx = 0, skipy = 0, height = _height;
 	const HistoryReply *reply = toHistoryReply(parent);
 	const HistoryForwarded *fwd = reply ? 0 : toHistoryForwarded(parent);
@@ -5258,7 +5290,8 @@ void HistoryImageLink::getState(TextLinkPtr &lnk, HistoryCursorState &state, int
 
 		int32 dateX = skipx + width - parent->timeWidth(false) - st::msgDateImgDelta - st::msgDateImgPadding.x();
 		int32 dateY = skipy + height - st::msgDateFont->height - st::msgDateImgDelta - st::msgDateImgPadding.y();
-		if (parent->out()) {
+		if (fromChannel) {
+		} else if (out) {
 			dateX -= st::msgCheckRect.pxWidth() + st::msgDateImgCheckSpace;
 		}
 		bool inDate = QRect(dateX, dateY, parent->timeWidth(true) - st::msgDateSpace, st::msgDateFont->height).contains(x, y);
@@ -5530,7 +5563,9 @@ bool HistoryMessage::textHasLinks() {
 }
 
 void HistoryMessage::draw(QPainter &p, uint32 selection) const {
-	textstyleSet(&(out() ? st::outTextStyle : st::inTextStyle));
+	bool outbg = out() && !fromChannel();
+
+	textstyleSet(&(outbg ? st::outTextStyle : st::inTextStyle));
 
 	uint64 ms = App::main() ? App::main()->animActiveTime(id) : 0;
 	if (ms) {
@@ -5550,17 +5585,21 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const {
 		fromNameUpdated();
 		_fromVersion = _from->nameVersion;
 	}
-	int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+	int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
 	if (justMedia()) {
 		if (_media->maxWidth() > mwidth) mwidth = _media->maxWidth();
 		if (_media->currentWidth() < mwidth) mwidth = _media->currentWidth();
 	}
 	if (width > mwidth) {
-		if (out()) left += width - mwidth;
+		if (fromChannel()) {
+			left += (width - mwidth) / 2;
+		} else if (out()) {
+			left += width - mwidth;
+		}
 		width = mwidth;
 	}
 
-	if (displayFromName()) {
+	if (displayFromPhoto()) {
 		p.drawPixmap(left, _height - st::msgMargin.bottom() - st::msgPhotoSize, _from->photo->pixRounded(st::msgPhotoSize));
 //		width -= st::msgPhotoSkip;
 		left += st::msgPhotoSkip;
@@ -5568,7 +5607,11 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const {
 	if (width < 1) return;
 
 	if (width >= _maxw) {
-		if (out()) left += width - _maxw;
+		if (fromChannel()) {
+			left += (width - _maxw) / 2;
+		} else if (out()) {
+			left += width - _maxw;
+		}
 		width = _maxw;
 	}
 	if (justMedia()) {
@@ -5579,9 +5622,9 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const {
 	} else {
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
 
-		style::color bg(selected ? (out() ? st::msgOutSelectBg : st::msgInSelectBg) : (out() ? st::msgOutBg : st::msgInBg));
-		style::color sh(selected ? (out() ? st::msgOutSelectShadow : st::msgInSelectShadow) : (out() ? st::msgOutShadow : st::msgInShadow));
-		RoundCorners cors(selected ? (out() ? MessageOutSelectedCorners : MessageInSelectedCorners) : (out() ? MessageOutCorners : MessageInCorners));
+		style::color bg(selected ? (outbg ? st::msgOutSelectBg : st::msgInSelectBg) : (outbg ? st::msgOutBg : st::msgInBg));
+		style::color sh(selected ? (outbg ? st::msgOutSelectShadow : st::msgInSelectShadow) : (outbg ? st::msgOutShadow : st::msgInShadow));
+		RoundCorners cors(selected ? (outbg ? MessageOutSelectedCorners : MessageInSelectedCorners) : (outbg ? MessageOutCorners : MessageInCorners));
 		App::roundRect(p, r, bg, cors, &sh);
 
 		if (displayFromName()) {
@@ -5601,11 +5644,12 @@ void HistoryMessage::draw(QPainter &p, uint32 selection) const {
 		}
 		p.setFont(st::msgDateFont->f);
 
-		style::color date(selected ? (out() ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out() ? st::msgOutDateColor : st::msgInDateColor));
+		style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 		p.setPen(date->p);
 
 		p.drawText(r.right() - st::msgPadding.right() + st::msgDateDelta.x() - timeWidth(true) + st::msgDateSpace, r.bottom() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgDateFont->descent, _time);
-		if (out()) {
+		if (fromChannel()) {
+		} else if (out()) {
 			QPoint iconPos(r.right() + st::msgCheckPos.x() - st::msgPadding.right() - st::msgCheckRect.pxWidth(), r.bottom() + st::msgCheckPos.y() - st::msgPadding.bottom() + st::msgDateDelta.y() - st::msgCheckRect.pxHeight());
 			const QRect *iconRect;
 			if (id > 0) {
@@ -5666,23 +5710,31 @@ int32 HistoryMessage::resize(int32 width) {
 }
 
 bool HistoryMessage::hasPoint(int32 x, int32 y) const {
-	int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+	int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
 	if (justMedia()) {
 		if (_media->maxWidth() > mwidth) mwidth = _media->maxWidth();
 		if (_media->currentWidth() < mwidth) mwidth = _media->currentWidth();
 	}
 	if (width > mwidth) {
-		if (out()) left += width - mwidth;
+		if (fromChannel()) {
+			left += (width - mwidth) / 2;
+		} else if (out()) {
+			left += width - mwidth;
+		}
 		width = mwidth;
 	}
 
-	if (displayFromName()) { // from user left photo
+	if (displayFromPhoto()) { // from user left photo
 		left += st::msgPhotoSkip;
 	}
 	if (width < 1) return false;
 
 	if (width >= _maxw) {
-		if (out()) left += width - _maxw;
+		if (fromChannel()) {
+			left += (width - _maxw) / 2;
+		} else if (out()) {
+			left += width - _maxw;
+		}
 		width = _maxw;
 	}
 	if (justMedia()) {
@@ -5696,17 +5748,21 @@ void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
 	state = HistoryDefaultCursorState;
 	lnk = TextLinkPtr();
 
-	int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+	int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
 	if (justMedia()) {
 		if (_media->maxWidth() > mwidth) mwidth = _media->maxWidth();
 		if (_media->currentWidth() < mwidth) mwidth = _media->currentWidth();
 	}
 	if (width > mwidth) {
-		if (out()) left += width - mwidth;
+		if (fromChannel()) {
+			left += (width - mwidth) / 2;
+		} else if (out()) {
+			left += width - mwidth;
+		}
 		width = mwidth;
 	}
 
-	if (displayFromName()) { // from user left photo
+	if (displayFromPhoto()) { // from user left photo
 		if (x >= left && x < left + st::msgPhotoSize && y >= _height - st::msgMargin.bottom() - st::msgPhotoSize && y < _height - st::msgMargin.bottom()) {
 			lnk = _from->lnk;
 			return;
@@ -5717,7 +5773,11 @@ void HistoryMessage::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32
 	if (width < 1) return;
 
 	if (width >= _maxw) {
-		if (out()) left += width - _maxw;
+		if (fromChannel()) {
+			left += (width - _maxw) / 2;
+		} else if (out()) {
+			left += width - _maxw;
+		}
 		width = _maxw;
 	}
 	if (justMedia()) {
@@ -5769,20 +5829,28 @@ void HistoryMessage::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x,
 	upon = false;
 	if (justMedia()) return;
 
-	int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-	if (width > st::msgMaxWidth) {
-		if (out()) left += width - st::msgMaxWidth;
-		width = st::msgMaxWidth;
+	int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+	if (width > mwidth) {
+		if (fromChannel()) {
+			left += (width - mwidth) / 2;
+		} else if (out()) {
+			left += width - mwidth;
+		}
+		width = mwidth;
 	}
 
-	if (displayFromName()) { // from user left photo
+	if (displayFromPhoto()) { // from user left photo
 //		width -= st::msgPhotoSkip;
 		left += st::msgPhotoSkip;
 	}
 	if (width < 1) return;
 
 	if (width >= _maxw) {
-		if (out()) left += width - _maxw;
+		if (fromChannel()) {
+			left += (width - _maxw) / 2;
+		} else if (out()) {
+			left += width - _maxw;
+		}
 		width = _maxw;
 	}
 	QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -5800,7 +5868,7 @@ void HistoryMessage::drawInDialog(QPainter &p, const QRect &r, bool act, const H
 	if (cacheFor != this) {
 		cacheFor = this;
 		QString msg(inDialogsText());
-		if (!_history->peer->isUser() || out()) { // CHANNELS_UI
+		if ((!_history->peer->isUser() || out()) && !fromChannel()) {
 			TextCustomTagsMap custom;
 			custom.insert(QChar('c'), qMakePair(textcmdStartLink(1), textcmdStopLink()));
 			msg = lng_message_with_from(lt_from, textRichPrepare((_from == App::self()) ? lang(lng_from_you) : _from->shortName()), lt_message, textRichPrepare(msg));
@@ -5819,7 +5887,7 @@ void HistoryMessage::drawInDialog(QPainter &p, const QRect &r, bool act, const H
 }
 
 QString HistoryMessage::notificationHeader() const {
-    return !_history->peer->isUser() ? from()->name : QString();
+    return (!_history->peer->isUser() && !fromChannel()) ? from()->name : QString();
 }
 
 QString HistoryMessage::notificationText() const {
@@ -5847,7 +5915,7 @@ HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, const
 	fwdNameUpdated();
 }
 
-HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, MsgId id, HistoryMessage *msg) : HistoryMessage(history, block, id, newMessageFlags(history->peer) | (msg->getMedia() && (msg->getMedia()->type() == MediaTypeAudio/* || msg->getMedia()->type() == MediaTypeVideo*/) ? MTPDmessage_flag_media_unread : 0), ::date(unixtime()), MTP::authedId(), msg->justMedia() ? QString() : msg->HistoryMessage::selectedText(FullItemSel), msg->HistoryMessage::textLinks(), msg->getMedia())
+HistoryForwarded::HistoryForwarded(History *history, HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg) : HistoryMessage(history, block, id, newMessageFlags(history->peer) | (msg->getMedia() && (msg->getMedia()->type() == MediaTypeAudio/* || msg->getMedia()->type() == MediaTypeVideo*/) ? MTPDmessage_flag_media_unread : 0), date, from, msg->justMedia() ? QString() : msg->HistoryMessage::selectedText(FullItemSel), msg->HistoryMessage::textLinks(), msg->getMedia())
 , fwdDate(msg->dateForwarded())
 , fwdFrom(msg->fromForwarded())
 , fwdFromVersion(fwdFrom->nameVersion)
@@ -5887,7 +5955,8 @@ void HistoryForwarded::draw(QPainter &p, uint32 selection) const {
 void HistoryForwarded::drawForwardedFrom(QPainter &p, int32 x, int32 y, int32 w, bool selected) const {
 	style::font serviceFont(st::msgServiceFont), serviceName(st::msgServiceNameFont);
 
-	p.setPen((selected ? (out() ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (out() ? st::msgOutServiceColor : st::msgInServiceColor))->p);
+	bool outbg = out() && !fromChannel();
+	p.setPen((selected ? (outbg ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (outbg ? st::msgOutServiceColor : st::msgInServiceColor))->p);
 	p.setFont(serviceFont->f);
 
 	if (w >= fromWidth) {
@@ -5917,20 +5986,28 @@ int32 HistoryForwarded::resize(int32 width) {
 
 bool HistoryForwarded::hasPoint(int32 x, int32 y) const {
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 //			width -= st::msgPhotoSkip;
 			left += st::msgPhotoSkip;
 		}
 		if (width < 1) return false;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -5944,13 +6021,17 @@ void HistoryForwarded::getState(TextLinkPtr &lnk, HistoryCursorState &state, int
 	state = HistoryDefaultCursorState;
 
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 			if (x >= left && x < left + st::msgPhotoSize) {
 				return HistoryMessage::getState(lnk, state, x, y);
 			}
@@ -5960,7 +6041,11 @@ void HistoryForwarded::getState(TextLinkPtr &lnk, HistoryCursorState &state, int
 		if (width < 1) return;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -6002,20 +6087,28 @@ void HistoryForwarded::getSymbol(uint16 &symbol, bool &after, bool &upon, int32
 	upon = false;
 
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 //			width -= st::msgPhotoSkip;
 			left += st::msgPhotoSkip;
 		}
 		if (width < 1) return;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -6147,10 +6240,11 @@ void HistoryReply::draw(QPainter &p, uint32 selection) const {
 
 void HistoryReply::drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool selected, bool likeService) const {
 	style::color bar;
+	bool outbg = out() && !fromChannel();
 	if (likeService) {
 		bar = st::white;
 	} else {
-		bar = (selected ? (out() ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (out() ? st::msgOutReplyBarColor : st::msgInReplyBarColor));
+		bar = (selected ? (outbg ? st::msgOutReplyBarSelColor : st::msgInReplyBarSelColor) : (outbg ? st::msgOutReplyBarColor : st::msgInReplyBarColor));
 	}
 	p.fillRect(x + st::msgReplyBarPos.x(), y + st::msgReplyPadding.top() + st::msgReplyBarPos.y(), st::msgReplyBarSize.width(), st::msgReplyBarSize.height(), bar->b);
 
@@ -6173,14 +6267,14 @@ void HistoryReply::drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool sele
 				if (likeService) {
 					p.setPen(st::white->p);
 				} else {
-					p.setPen((selected ? (out() ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (out() ? st::msgOutServiceColor : st::msgInServiceColor))->p);
+					p.setPen((selected ? (outbg ? st::msgOutServiceSelColor : st::msgInServiceSelColor) : (outbg ? st::msgOutServiceColor : st::msgInServiceColor))->p);
 				}
 				replyToName.drawElided(p, x + st::msgReplyBarSkip + previewSkip, y + st::msgReplyPadding.top(), w - st::msgReplyBarSkip - previewSkip);
 
 				HistoryMessage *replyToAsMsg = replyToMsg->toHistoryMessage();
 				if (likeService) {
 				} else if ((replyToAsMsg && replyToAsMsg->justMedia()) || replyToMsg->serviceMsg()) {
-					style::color date(selected ? (out() ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out() ? st::msgOutDateColor : st::msgInDateColor));
+					style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 					p.setPen(date->p);
 				} else {
 					p.setPen(st::msgColor->p);
@@ -6189,7 +6283,7 @@ void HistoryReply::drawReplyTo(QPainter &p, int32 x, int32 y, int32 w, bool sele
 			}
 		} else {
 			p.setFont(st::msgDateFont->f);
-			style::color date(selected ? (out() ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (out() ? st::msgOutDateColor : st::msgInDateColor));
+			style::color date(selected ? (outbg ? st::msgOutSelectDateColor : st::msgInSelectDateColor) : (outbg ? st::msgOutDateColor : st::msgInDateColor));
 			if (likeService) {
 				p.setPen(st::white->p);
 			} else {
@@ -6219,20 +6313,28 @@ int32 HistoryReply::resize(int32 width) {
 
 bool HistoryReply::hasPoint(int32 x, int32 y) const {
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 //			width -= st::msgPhotoSkip;
 			left += st::msgPhotoSkip;
 		}
 		if (width < 1) return false;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -6246,13 +6348,17 @@ void HistoryReply::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x
 	state = HistoryDefaultCursorState;
 
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 			if (x >= left && x < left + st::msgPhotoSize) {
 				return HistoryMessage::getState(lnk, state, x, y);
 			}
@@ -6262,7 +6368,11 @@ void HistoryReply::getState(TextLinkPtr &lnk, HistoryCursorState &state, int32 x
 		if (width < 1) return;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -6301,20 +6411,28 @@ void HistoryReply::getSymbol(uint16 &symbol, bool &after, bool &upon, int32 x, i
 	upon = false;
 
 	if (!justMedia()) {
-		int32 left = out() ? st::msgMargin.right() : st::msgMargin.left(), width = _history->width - st::msgMargin.left() - st::msgMargin.right();
-		if (width > st::msgMaxWidth) {
-			if (out()) left += width - st::msgMaxWidth;
-			width = st::msgMaxWidth;
+		int32 left = fromChannel() ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out() ? st::msgMargin.right() : st::msgMargin.left()), width = _history->width - st::msgMargin.left() - st::msgMargin.right(), mwidth = st::msgMaxWidth;
+		if (width > mwidth) {
+			if (fromChannel()) {
+				left += (width - mwidth) / 2;
+			} else if (out()) {
+				left += width - mwidth;
+			}
+			width = mwidth;
 		}
 
-		if (displayFromName()) { // from user left photo
+		if (displayFromPhoto()) { // from user left photo
 //			width -= st::msgPhotoSkip;
 			left += st::msgPhotoSkip;
 		}
 		if (width < 1) return;
 
 		if (width >= _maxw) {
-			if (out()) left += width - _maxw;
+			if (fromChannel()) {
+				left += (width - _maxw) / 2;
+			} else if (out()) {
+				left += width - _maxw;
+			}
 			width = _maxw;
 		}
 		QRect r(left, st::msgMargin.top(), width, _height - st::msgMargin.top() - st::msgMargin.bottom());
@@ -6350,7 +6468,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 	case mtpc_messageActionChatAddUser: {
 		const MTPDmessageActionChatAddUser &d(action.c_messageActionChatAddUser());
 		if (peerFromUser(d.vuser_id) == _from->id) {
-			text = lng_action_user_joined(lt_from, from);
+			text = channelId() ? lng_action_user_joined_channel(lt_from, from) : lng_action_user_joined(lt_from, from);
 		} else {
 			UserData *u = App::user(peerFromUser(d.vuser_id));
 			second = TextLinkPtr(new PeerLink(u));
@@ -6366,7 +6484,7 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 	case mtpc_messageActionChatJoinedByLink: {
 		const MTPDmessageActionChatJoinedByLink &d(action.c_messageActionChatJoinedByLink());
 		if (true || peerFromUser(d.vinviter_id) == _from->id) {
-			text = lng_action_user_joined_by_link(lt_from, from);
+			text = channelId() ? lng_action_user_joined_by_link_channel(lt_from, from) : lng_action_user_joined_by_link(lt_from, from);
 		//} else {
 			//UserData *u = App::user(App::peerFromUser(d.vinviter_id));
 			//second = TextLinkPtr(new PeerLink(u));
@@ -6390,13 +6508,13 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 	} break;
 
 	case mtpc_messageActionChatDeletePhoto: {
-		text = lng_action_removed_photo(lt_from, from);
+		text = fromChannel() ? lang(lng_action_removed_photo_channel) : lng_action_removed_photo(lt_from, from);
 	} break;
 
 	case mtpc_messageActionChatDeleteUser: {
 		const MTPDmessageActionChatDeleteUser &d(action.c_messageActionChatDeleteUser());
 		if (peerFromUser(d.vuser_id) == _from->id) {
-			text = lng_action_user_left(lt_from, from);
+			text = channelId() ? lng_action_user_left_channel(lt_from, from) : lng_action_user_left(lt_from, from);
 		} else {
 			UserData *u = App::user(peerFromUser(d.vuser_id));
 			second = TextLinkPtr(new PeerLink(u));
@@ -6409,12 +6527,12 @@ void HistoryServiceMsg::setMessageByAction(const MTPmessageAction &action) {
 		if (d.vphoto.type() == mtpc_photo) {
 			_media = new HistoryPhoto(history()->peer, d.vphoto.c_photo(), st::msgServicePhotoWidth);
 		}
-		text = lng_action_changed_photo(lt_from, from);
+		text = fromChannel() ? lang(lng_action_changed_photo_channel) : lng_action_changed_photo(lt_from, from);
 	} break;
 
 	case mtpc_messageActionChatEditTitle: {
 		const MTPDmessageActionChatEditTitle &d(action.c_messageActionChatEditTitle());
-		text = lng_action_changed_title(lt_from, from, lt_title, textClean(qs(d.vtitle)));
+		text = fromChannel() ? lng_action_changed_title_channel(lt_title, textClean(qs(d.vtitle))) : lng_action_changed_title(lt_from, from, lt_title, textClean(qs(d.vtitle)));
 	} break;
 
 	default: from = QString(); break;
diff --git a/Telegram/SourceFiles/history.h b/Telegram/SourceFiles/history.h
index 47b46680c..97b90cf06 100644
--- a/Telegram/SourceFiles/history.h
+++ b/Telegram/SourceFiles/history.h
@@ -175,13 +175,13 @@ struct History : public QList<HistoryBlock*> {
 	}
 
 	HistoryItem *createItem(HistoryBlock *block, const MTPmessage &msg, bool newMsg, bool returnExisting = false);
-	HistoryItem *createItemForwarded(HistoryBlock *block, MsgId id, HistoryMessage *msg);
+	HistoryItem *createItemForwarded(HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg);
 	HistoryItem *createItemDocument(HistoryBlock *block, MsgId id, int32 flags, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc);
 
 	HistoryItem *addToBackService(MsgId msgId, QDateTime date, const QString &text, int32 flags = 0, HistoryMedia *media = 0, bool newMsg = true);
 	HistoryItem *addToBack(const MTPmessage &msg, bool newMsg = true);
 	HistoryItem *addToHistory(const MTPmessage &msg);
-	HistoryItem *addToBackForwarded(MsgId id, HistoryMessage *item);
+	HistoryItem *addToBackForwarded(MsgId id, QDateTime date, int32 from, HistoryMessage *item);
 	HistoryItem *addToBackDocument(MsgId id, int32 flags, MsgId replyTo, QDateTime date, int32 from, DocumentData *doc);
 
 	void addToFront(const QVector<MTPMessage> &slice);
@@ -724,8 +724,11 @@ public:
 	bool hasTextLinks() const {
 		return _flags & MTPDmessage_flag_HAS_TEXT_LINKS;
 	}
+	bool fromChannel() const {
+		return _from->isChannel();
+	}
 	virtual bool needCheck() const {
-		return true;
+		return out() && !fromChannel();
 	}
 	virtual bool hasPoint(int32 x, int32 y) const {
 		return false;
@@ -820,7 +823,10 @@ public:
 	}
 
 	bool displayFromName() const {
-		return !out() && !history()->peer->isUser();
+		return (!out() || fromChannel()) && !history()->peer->isUser();
+	}
+	bool displayFromPhoto() const {
+		return !out() && !history()->peer->isUser() && !fromChannel();
 	}
 
 	virtual ~HistoryItem();
@@ -1359,7 +1365,15 @@ public:
 		return _time;
 	}
 	int32 timeWidth(bool forText) const {
-		return _timeWidth + (forText ? (st::msgDateSpace + (out() ? st::msgDateCheckSpace + st::msgCheckRect.pxWidth() : 0) - st::msgDateDelta.x()) : 0);
+		int32 result = _timeWidth;
+		if (forText) {
+			result += st::msgDateSpace - st::msgDateDelta.x();
+			if (fromChannel()) {
+			} else if (out()) {
+				result += st::msgDateCheckSpace + st::msgCheckRect.pxWidth();
+			}
+		}
+		return result;
 	}
 	virtual bool animating() const {
 		return _media ? _media->animating() : false;
@@ -1397,7 +1411,7 @@ class HistoryForwarded : public HistoryMessage {
 public:
 
 	HistoryForwarded(History *history, HistoryBlock *block, const MTPDmessage &msg);
-	HistoryForwarded(History *history, HistoryBlock *block, MsgId id, HistoryMessage *msg);
+	HistoryForwarded(History *history, HistoryBlock *block, MsgId id, QDateTime date, int32 from, HistoryMessage *msg);
 
 	void initDimensions();
 	void fwdNameUpdated() const;
diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp
index 1e4126e59..03aea7ec0 100644
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@@ -1411,7 +1411,7 @@ void HistoryList::onUpdateSelected() {
 		}
 		cur = textlnkDown() ? style::cur_pointer : style::cur_default;
 		if (_dragAction == Selecting) {
-			bool canSelectMany = hist && (!hist->peer->isChannel() || hist->peer->asChannel()->adminned);
+			bool canSelectMany = (hist != 0);
 			if (item == _dragItem && item == App::hoveredItem() && !_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 				bool afterSymbol, uponSymbol;
 				uint16 second;
@@ -1507,10 +1507,6 @@ void HistoryList::applyDragSelection() {
 }
 
 void HistoryList::applyDragSelection(SelectedItems *toItems) const {
-	if (hist && hist->peer->isChannel() && !hist->peer->asChannel()->adminned) {
-		toItems->clear();
-		return;
-	}
 	if (!toItems->isEmpty() && toItems->cbegin().value() != FullItemSel) {
 		toItems->clear();
 	}
@@ -2578,8 +2574,12 @@ void HistoryWidget::sendActionDone(const MTPBool &result, mtpRequestId req) {
 
 void HistoryWidget::activate() {
 	if (_history) updateListSize(0, true);
+	setInnerFocus();
+}
+
+void HistoryWidget::setInnerFocus() {
 	if (_list) {
-		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked()) {
+		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field.setFocus();
@@ -2859,7 +2859,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		_replyForwardPreviewCancel.hide();
 	}
 	_previewCache.clear();
-	_scroll.setWidget(0);
+	_scroll.takeWidget();
 	if (_list) _list->deleteLater();
 	_list = 0;
 	updateTopBarSelection();
@@ -2929,7 +2929,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		
 		if (_history->draftToId > 0 || !_history->draft.isEmpty()) {
 			setFieldText(_history->draft);
-			_field.setFocus();
+			setInnerFocus();
 			_history->draftCursor.applyTo(_field, &_synthedTextUpdate);
 			_replyToId = readyToForward() ? 0 : _history->draftToId;
 			if (_history->draftPreviewCancelled) {
@@ -2938,7 +2938,7 @@ void HistoryWidget::showPeerHistory(const PeerId &peerId, MsgId showAtMsgId) {
 		} else {
 			Local::MessageDraft draft = Local::readDraft(_peer->id);
 			setFieldText(draft.text);
-			_field.setFocus();
+			setInnerFocus();
 			if (!draft.text.isEmpty()) {
 				MessageCursor cur = Local::readDraftPositions(_peer->id);
 				cur.applyTo(_field, &_synthedTextUpdate);
@@ -3703,6 +3703,7 @@ void HistoryWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTo
 	a_bgAlpha = anim::fvalue(1, 0);
 	_showAnim.start();
 	App::main()->topBar()->update();
+	activate();
 }
 
 bool HistoryWidget::showStep(float64 ms) {
@@ -5255,6 +5256,8 @@ void HistoryWidget::onStickerSend(DocumentData *sticker) {
 	bool fromChannelName = _history->peer->isChannel();
 	if (fromChannelName) {
 		sendFlags |= MTPmessages_SendMessage_flag_broadcast;
+	} else {
+		flags |= MTPDmessage::flag_from_id;
 	}
 	_history->addToBackDocument(newId.msg, flags, replyToId(), date(MTP_int(unixtime())), fromChannelName ? 0 : MTP::authedId(), sticker);
 
@@ -5658,7 +5661,7 @@ void HistoryWidget::updateTopBarSelection() {
 	updateControlsVisibility();
 	updateListSize();
 	if (!App::wnd()->layerShown() && !App::passcoded()) {
-		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked()) {
+		if (_selCount || (_list && _list->wasSelectedText()) || _recording || isBotStart() || isBlocked() || !_canSendMessages) {
 			_list->setFocus();
 		} else {
 			_field.setFocus();
diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h
index 858120c1d..0f8739bf2 100644
--- a/Telegram/SourceFiles/historywidget.h
+++ b/Telegram/SourceFiles/historywidget.h
@@ -585,6 +585,7 @@ public slots:
 	void onPhotoFailed(quint64 id);
 
 	void activate();
+	void setInnerFocus();
 	void onMentionHashtagOrBotCommandInsert(QString str);
 	void onTextChange();
 
diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp
index 6d35b2580..eda4606fa 100644
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@@ -283,7 +283,7 @@ void TopBarWidget::showAll() {
         resizeEvent(0);
         return;
     }
-	PeerData *p = App::main() ? App::main()->profilePeer() : 0, *o = App::main() ? App::main()->overviewPeer() : 0;
+	PeerData *p = App::main() ? App::main()->profilePeer() : 0, *h = App::main() ? App::main()->historyPeer() : 0, *o = App::main() ? App::main()->overviewPeer() : 0;
 	if (p && (p->isChat() || (p->isUser() && (p->asUser()->contact >= 0 || !App::phoneFromSharedContact(peerToUser(p->id)).isEmpty())))) {
 		if (p->isChat()) {
 			if (p->asChat()->forbidden) {
@@ -321,7 +321,11 @@ void TopBarWidget::showAll() {
 		_deleteContact.hide();
 		if (!p && _selCount) {
 			_clearSelection.show();
-			_delete.show();
+			if ((h && h->isChannel() && !h->asChannel()->adminned) || (o && o->isChannel() && !o->asChannel()->adminned)) {
+				_delete.hide();
+			} else {
+				_delete.show();
+			}
 			_forward.show();
 			_mediaType.hide();
 		} else {
@@ -539,7 +543,7 @@ void MainWidget::finishForwarding(History *hist) {
 			if (genClientSideMessage) {
 				FullMsgId newId(peerToChannel(hist->peer->id), clientMsgId());
 				HistoryMessage *msg = static_cast<HistoryMessage*>(_toForward.cbegin().value());
-				hist->addToBackForwarded(newId.msg, msg);
+				hist->addToBackForwarded(newId.msg, date(MTP_int(unixtime())), hist->peer->isChannel() ? 0 : MTP::authedId(), msg);
 				if (HistorySticker *sticker = dynamic_cast<HistorySticker*>(msg->getMedia())) {
 					App::main()->incrementSticker(sticker->document());
 				}
@@ -2794,7 +2798,7 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 		const MTPDupdates_channelDifferenceEmpty &d(diff.c_updates_channelDifferenceEmpty());
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 
 	case mtpc_updates_channelDifferenceTooLong: {
@@ -2819,7 +2823,7 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 
 	case mtpc_updates_channelDifference: {
@@ -2833,17 +2837,17 @@ void MainWidget::gotChannelDifference(ChannelData *channel, const MTPupdates_Cha
 
 		if (d.has_timeout()) timeout = d.vtimeout.v;
 		flags = d.vflags.v;
-		channel->ptsReceived(d.vpts.v);
+		channel->ptsInit(d.vpts.v);
 	} break;
 	}
 
 	channel->ptsSetRequesting(false);
 
-	if (flags & MTPupdates_ChannelDifference_flag_final) {
+	if (!(flags & MTPupdates_ChannelDifference_flag_final)) {
 		MTP_LOG(0, ("getChannelDifference { good - after not final channelDifference was received }%1").arg(cTestMode() ? " TESTMODE" : ""));
 		getChannelDifference(channel);
 	} else if (timeout) {
-		QTimer::singleShot(timeout * 1000, this, SLOT(getDifference()));
+//		QTimer::singleShot(timeout * 1000, this, SLOT(getDifference()));
 	}
 
 	App::emitPeerUpdated();
@@ -3023,10 +3027,10 @@ void MainWidget::onGetDifferenceTimeByPts() {
 	}
 	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeByPts.begin(); i != _channelGetDifferenceTimeByPts.cend();) {
 		if (i.value() > now) {
-			wait = qMin(wait, i.value() - now);
+			wait = wait ? qMin(wait, i.value() - now) : (i.value() - now);
 			++i;
 		} else {
-			getChannelDifference(i.key());
+			getChannelDifference(i.key(), GetChannelDifferenceFromPtsGap);
 			i = _channelGetDifferenceTimeByPts.erase(i);
 		}
 	}
@@ -3052,10 +3056,10 @@ void MainWidget::onGetDifferenceTimeAfterFail() {
 	}
 	for (ChannelGetDifferenceTime::iterator i = _channelGetDifferenceTimeAfterFail.begin(); i != _channelGetDifferenceTimeAfterFail.cend();) {
 		if (i.value() > now) {
-			wait = qMin(wait, i.value() - now);
+			wait = wait ? qMin(wait, i.value() - now) : (i.value() - now);
 			++i;
 		} else {
-			getChannelDifference(i.key());
+			getChannelDifference(i.key(), GetChannelDifferenceFromFail);
 			i = _channelGetDifferenceTimeAfterFail.erase(i);
 		}
 	}
diff --git a/Telegram/SourceFiles/mtproto/mtpConnection.h b/Telegram/SourceFiles/mtproto/mtpConnection.h
index c3dc8c2df..5262799b9 100644
--- a/Telegram/SourceFiles/mtproto/mtpConnection.h
+++ b/Telegram/SourceFiles/mtproto/mtpConnection.h
@@ -55,6 +55,10 @@ enum {
 	MTPDstickerSet_flag_NOT_LOADED = (1 << 31), // client side flag for not yet loaded set
 
 	MTPDchannel_flag_is_admin = (1 << 0),
+	MTPDchannel_flag_is_broadcast = (1 << 1),
+	MTPDchannel_flag_is_public = (1 << 2),
+	MTPDchannel_flag_left = (1 << 3),
+	MTPDchannel_flag_kicked = (1 << 4),
 
 	MTPupdates_ChannelDifference_flag_final = (1 << 0),
 
diff --git a/Telegram/SourceFiles/overviewwidget.cpp b/Telegram/SourceFiles/overviewwidget.cpp
index 2d3767c87..ed20a1445 100644
--- a/Telegram/SourceFiles/overviewwidget.cpp
+++ b/Telegram/SourceFiles/overviewwidget.cpp
@@ -419,9 +419,9 @@ bool OverviewInner::itemHasPoint(MsgId msgId, int32 index, int32 x, int32 y) con
 		HistoryMedia *media = item ? item->getMedia(true) : 0;
 		if (media) {
 			int32 w = _width - st::msgMargin.left() - st::msgMargin.right();
-			bool out = item->out();
-			int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-			if (item->displayFromName()) {
+			bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+			int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+			if (item->displayFromPhoto()) {
 				left += st::msgPhotoSkip;
 			}
 			return media->hasPoint(x - left, y - st::msgMargin.top(), item, w);
@@ -862,10 +862,6 @@ void OverviewInner::touchScrollUpdated(const QPoint &screenPos) {
 void OverviewInner::applyDragSelection() {
 	if (_dragSelFromIndex < 0 || _dragSelToIndex < 0) return;
 
-	if (_peer && _peer->isChannel() && !_peer->asChannel()->adminned) {
-		_selected.clear();
-		return;
-	}
 	if (!_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 		_selected.clear();
 	}
@@ -1228,9 +1224,9 @@ void OverviewInner::paintEvent(QPaintEvent *e) {
 					HistoryItem *item = App::histItemById(_channel, _items[i].msgid);
 					HistoryMedia *media = item ? item->getMedia(true) : 0;
 					if (media) {
-						bool out = item->out();
-						int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-						if (item->displayFromName()) {
+						bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+						int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+						if (item->displayFromPhoto()) {
 							p.drawPixmap(left, media->countHeight(item, w) - st::msgPhotoSize, item->from()->photo->pixRounded(st::msgPhotoSize));
 							left += st::msgPhotoSkip;
 						}
@@ -1435,9 +1431,9 @@ void OverviewInner::onUpdateSelected() {
 					index = i;
 					HistoryMedia *media = item->getMedia(true);
 					if (media) {
-						bool out = item->out();
-						int32 mw = media->maxWidth(), left = (out ? st::msgMargin.right() : st::msgMargin.left()) + (out && mw < w ? (w - mw) : 0);
-						if (item->displayFromName()) {
+						bool out = item->out(), fromChannel = item->fromChannel(), outbg = out && !fromChannel;
+						int32 mw = media->maxWidth(), left = (fromChannel ? (st::msgMargin.left() + st::msgMargin.right()) / 2 : (out ? st::msgMargin.right() : st::msgMargin.left())) + ((mw < w) ? (fromChannel ? (w - mw) / 2 : (out ? w - mw : 0)) : 0);
+						if (item->displayFromPhoto()) {
 							if (QRect(left, y + st::msgMargin.top() + media->countHeight(item, w) - st::msgPhotoSize, st::msgPhotoSize, st::msgPhotoSize).contains(m)) {
 								lnk = item->from()->lnk;
 							}
@@ -1509,7 +1505,7 @@ void OverviewInner::onUpdateSelected() {
 		}
 		cur = (textlnkDown() || _lnkDownIndex) ? style::cur_pointer : style::cur_default;
 		if (_dragAction == Selecting) {
-			bool canSelectMany = _peer && (!_peer->isChannel() || _peer->asChannel()->adminned);
+			bool canSelectMany = (_peer != 0);
 			if (_mousedItem == _dragItem && (lnk || lnkIndex) && !_selected.isEmpty() && _selected.cbegin().value() != FullItemSel) {
 				bool afterSymbol = false, uponSymbol = false;
 				uint16 second = 0;
diff --git a/Telegram/SourceFiles/structs.cpp b/Telegram/SourceFiles/structs.cpp
index 247b42c41..79609df36 100644
--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@@ -868,7 +868,11 @@ id(id), type(type), url(url), displayUrl(displayUrl), siteName(siteName), title(
 
 void PeerLink::onClick(Qt::MouseButton button) const {
 	if (button == Qt::LeftButton && App::main()) {
-		App::main()->showPeerProfile(peer());
+		if (peer() && peer()->isChannel() && App::main()->historyPeer() != peer()) {
+			App::main()->showPeerHistory(peer()->id, ShowAtUnreadMsgId);
+		} else {
+			App::main()->showPeerProfile(peer());
+		}
 	}
 }
 
diff --git a/Telegram/SourceFiles/structs.h b/Telegram/SourceFiles/structs.h
index e17d53a8c..142d3d2c5 100644
--- a/Telegram/SourceFiles/structs.h
+++ b/Telegram/SourceFiles/structs.h
@@ -415,7 +415,7 @@ private:
 class ChannelData : public PeerData {
 public:
 
-	ChannelData(const PeerId &id) : PeerData(id), access(0), inputChat(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))), date(0), version(0), adminned(false), left(false), forbidden(true), botStatus(-1) {
+	ChannelData(const PeerId &id) : PeerData(id), access(0), inputChat(MTP_inputChannel(MTP_int(bareId()), MTP_long(0))), date(0), version(0), isBroadcast(false), isPublic(false), adminned(false), left(false), forbidden(true), botStatus(-1) {
 		setName(QString(), QString());
 	}
 	void setPhoto(const MTPChatPhoto &photo, const PhotoId &phId = UnknownPeerPhotoId);
@@ -428,6 +428,7 @@ public:
 	QString username;
 	int32 date;
 	int32 version;
+	bool isBroadcast, isPublic;
 	bool adminned;
 	bool left;
 	bool forbidden;
@@ -436,6 +437,9 @@ public:
 //	ImagePtr photoFull;
 	QString invitationUrl;
 
+	void ptsInit(int32 pts) {
+		_ptsWaiter.init(pts);
+	}
 	void ptsReceived(int32 pts) {
 		_ptsWaiter.updated(this, pts, 0);
 	}
diff --git a/Telegram/SourceFiles/window.cpp b/Telegram/SourceFiles/window.cpp
index 91f38ed05..53863853d 100644
--- a/Telegram/SourceFiles/window.cpp
+++ b/Telegram/SourceFiles/window.cpp
@@ -198,7 +198,7 @@ void NotifyWindow::updateNotifyDisplay() {
 				item->drawInDialog(p, r, active, textCachedFor, itemTextCache);
 			} else {
 				p.setFont(st::dlgHistFont->f);
-				if (item->displayFromName()) {
+				if (item->displayFromName() && !item->fromChannel()) {
 					itemTextCache.setText(st::dlgHistFont, item->from()->name);
 					p.setPen(st::dlgSystemColor->p);
 					itemTextCache.drawElided(p, r.left(), r.top(), r.width(), st::dlgHistFont->height);