diff --git a/example-build-run.sh b/example-build-run.sh
index 8e5f66f1c020..fc57c8632d6a 100755
--- a/example-build-run.sh
+++ b/example-build-run.sh
@@ -10,7 +10,6 @@ DEPLOY_DIR=/var/www/rocket.chat
 
 ### BUILD
 meteor npm install
-meteor npm run postinstall
 
 # on the very first build, meteor build command should fail due to a bug on emojione package (related to phantomjs installation)
 # the command below forces the error to happen before build command (not needed on subsequent builds)
diff --git a/packages/rocketchat-lib/server/lib/roomTypes.js b/packages/rocketchat-lib/server/lib/roomTypes.js
index 68aec9b5ef6f..e6ee83c8bf70 100644
--- a/packages/rocketchat-lib/server/lib/roomTypes.js
+++ b/packages/rocketchat-lib/server/lib/roomTypes.js
@@ -31,6 +31,9 @@ RocketChat.roomTypes = new class roomTypesServer extends RoomTypesCommon {
 		return this.roomTypes[roomType] && this.roomTypes[roomType].roomFind;
 	}
 
+	getRoomName(roomType, roomData) {
+		return this.roomTypes[roomType] && this.roomTypes[roomType].roomName && this.roomTypes[roomType].roomName(roomData);
+	}
 
 	/**
 	 * Run the publish for a room type
diff --git a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
index 860f2232860a..ac88c861308f 100644
--- a/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
@@ -4,7 +4,7 @@ import s from 'underscore.string';
 function getEmailContent({ messageContent, message, user, room }) {
 	const lng = user && user.language || RocketChat.settings.get('language') || 'en';
 
-	const roomName = s.escapeHTML(`#${ RocketChat.settings.get('UI_Allow_room_names_with_special_chars') ? room.fname || room.name : room.name }`);
+	const roomName = s.escapeHTML(`#${ RocketChat.roomTypes.getRoomName(room.t, room) }`);
 
 	const userName = s.escapeHTML(RocketChat.settings.get('UI_Use_Real_Name') ? message.u.name || message.u.username : message.u.username);
 
diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
index aee2caa865ff..391984ea973a 100644
--- a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
+++ b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -273,7 +273,7 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room, userId) {
 	let push_room = '';
 	if (RocketChat.settings.get('Push_show_username_room')) {
 		push_username = user.username;
-		push_room = `#${ room.name }`;
+		push_room = `#${ RocketChat.roomTypes.getRoomName(room.t, room) }`;
 	}
 
 	if (room.t == null || room.t === 'd') {