diff --git a/include/linphone/utils/enum-mask.h b/include/linphone/utils/enum-mask.h
index 4f619351d..d87e1f55c 100644
--- a/include/linphone/utils/enum-mask.h
+++ b/include/linphone/utils/enum-mask.h
@@ -40,8 +40,6 @@ public:
 		std::is_signed<typename std::underlying_type<T>::type>::value, int, unsigned int
 	>::type StorageType;
 
-	typedef std::integral_constant<int, 0> Zero;
-
 	// Zero initializer: Take 0 value or no value.
 	constexpr EnumMask (int *zero = 0) : mMask(0) {}
 
diff --git a/src/chat/chat-room/abstract-chat-room.h b/src/chat/chat-room/abstract-chat-room.h
index ffcf5b047..5a2db3d52 100644
--- a/src/chat/chat-room/abstract-chat-room.h
+++ b/src/chat/chat-room/abstract-chat-room.h
@@ -20,6 +20,8 @@
 #ifndef _ABSTRACT_CHAT_ROOM_H_
 #define _ABSTRACT_CHAT_ROOM_H_
 
+#include "linphone/utils/enum-mask.h"
+
 #include "chat/chat-message/chat-message.h"
 #include "conference/conference-interface.h"
 #include "core/core-accessor.h"
@@ -43,7 +45,7 @@ public:
 	L_DECLARE_ENUM(Capabilities, L_ENUM_VALUES_CHAT_ROOM_CAPABILITIES);
 	L_DECLARE_ENUM(State, L_ENUM_VALUES_CHAT_ROOM_STATE);
 
-	typedef int CapabilitiesMask;
+	typedef EnumMask<Capabilities> CapabilitiesMask;
 
 	virtual const ChatRoomId &getChatRoomId () const = 0;
 
diff --git a/src/chat/chat-room/basic-chat-room.cpp b/src/chat/chat-room/basic-chat-room.cpp
index 9b748b3c1..495de0140 100644
--- a/src/chat/chat-room/basic-chat-room.cpp
+++ b/src/chat/chat-room/basic-chat-room.cpp
@@ -44,7 +44,7 @@ BasicChatRoom::BasicChatRoom (
 }
 
 BasicChatRoom::CapabilitiesMask BasicChatRoom::getCapabilities () const {
-	return static_cast<CapabilitiesMask>(Capabilities::Basic);
+	return Capabilities::Basic;
 }
 
 bool BasicChatRoom::hasBeenLeft () const {
diff --git a/src/chat/chat-room/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp
index 4d62b4f50..db27436ee 100644
--- a/src/chat/chat-room/client-group-chat-room.cpp
+++ b/src/chat/chat-room/client-group-chat-room.cpp
@@ -159,7 +159,7 @@ shared_ptr<Core> ClientGroupChatRoom::getCore () const {
 }
 
 ClientGroupChatRoom::CapabilitiesMask ClientGroupChatRoom::getCapabilities () const {
-	return static_cast<CapabilitiesMask>(Capabilities::Conference);
+	return Capabilities::Conference;
 }
 
 bool ClientGroupChatRoom::hasBeenLeft () const {
diff --git a/src/chat/chat-room/real-time-text-chat-room.cpp b/src/chat/chat-room/real-time-text-chat-room.cpp
index 4e9ef0f9f..eecde90e7 100644
--- a/src/chat/chat-room/real-time-text-chat-room.cpp
+++ b/src/chat/chat-room/real-time-text-chat-room.cpp
@@ -107,7 +107,7 @@ RealTimeTextChatRoom::RealTimeTextChatRoom (const shared_ptr<Core> &core, const
 	BasicChatRoom(*new RealTimeTextChatRoomPrivate, core, chatRoomId) {}
 
 RealTimeTextChatRoom::CapabilitiesMask RealTimeTextChatRoom::getCapabilities () const {
-	return BasicChatRoom::getCapabilities() | static_cast<CapabilitiesMask>(Capabilities::RealTimeText);
+	return BasicChatRoom::getCapabilities() | Capabilities::RealTimeText;
 }
 
 uint32_t RealTimeTextChatRoom::getChar () const {
diff --git a/src/chat/chat-room/server-group-chat-room-stub.cpp b/src/chat/chat-room/server-group-chat-room-stub.cpp
index 02f25d22f..b883ce291 100644
--- a/src/chat/chat-room/server-group-chat-room-stub.cpp
+++ b/src/chat/chat-room/server-group-chat-room-stub.cpp
@@ -103,7 +103,7 @@ ServerGroupChatRoom::ServerGroupChatRoom (
 ) : ChatRoom(*new ServerGroupChatRoomPrivate, core, ChatRoomId(peerAddress, peerAddress)),
 	LocalConference(core, peerAddress, nullptr) {}
 
-int ServerGroupChatRoom::getCapabilities () const {
+ServerGroupChatRoom::CapabilitiesMask ServerGroupChatRoom::getCapabilities () const {
 	return 0;
 }