diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5e7299545..545159bc4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,12 +47,13 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES
 	chat/cpim/message/cpim-message.h
 	chat/cpim/parser/cpim-grammar.h
 	chat/cpim/parser/cpim-parser.h
-	chat/imdn.h
-	chat/is-composing.h
 	chat/modifier/chat-message-modifier.h
 	chat/modifier/cpim-chat-message-modifier.h
 	chat/modifier/encryption-chat-message-modifier.h
 	chat/modifier/multipart-chat-message-modifier.h
+	chat/notification/imdn.h
+	chat/notification/is-composing.h
+	chat/notification/is-composing-listener.h
 	conference/conference-listener.h
 	conference/conference-p.h
 	conference/conference.h
@@ -138,11 +139,11 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES
 	chat/cpim/message/cpim-message.cpp
 	chat/cpim/parser/cpim-grammar.cpp
 	chat/cpim/parser/cpim-parser.cpp
-	chat/imdn.cpp
-	chat/is-composing.cpp
 	chat/modifier/cpim-chat-message-modifier.cpp
 	chat/modifier/encryption-chat-message-modifier.cpp
 	chat/modifier/multipart-chat-message-modifier.cpp
+	chat/notification/imdn.cpp
+	chat/notification/is-composing.cpp
 	conference/conference.cpp
 	conference/local-conference-event-handler.cpp
 	conference/local-conference.cpp
diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp
index 95910a1d3..1c0db2089 100644
--- a/src/c-wrapper/api/c-chat-message.cpp
+++ b/src/c-wrapper/api/c-chat-message.cpp
@@ -30,7 +30,7 @@
 #include "chat/chat-message/chat-message-p.h"
 #include "chat/chat-room/chat-room-p.h"
 #include "chat/chat-room/real-time-text-chat-room-p.h"
-#include "chat/imdn.h"
+#include "chat/notification/imdn.h"
 
 // =============================================================================
 
diff --git a/src/chat/chat-message/chat-message-p.h b/src/chat/chat-message/chat-message-p.h
index 73c8a58f2..cf827e2f7 100644
--- a/src/chat/chat-message/chat-message-p.h
+++ b/src/chat/chat-message/chat-message-p.h
@@ -23,7 +23,7 @@
 #include <belle-sip/types.h>
 
 #include "chat/chat-message/chat-message.h"
-#include "chat/imdn.h"
+#include "chat/notification/imdn.h"
 #include "content/content.h"
 #include "content/content-type.h"
 #include "db/events-db.h"
diff --git a/src/chat/chat-room/chat-room-p.h b/src/chat/chat-room/chat-room-p.h
index 4dd4663f6..c1f3823ee 100644
--- a/src/chat/chat-room/chat-room-p.h
+++ b/src/chat/chat-room/chat-room-p.h
@@ -20,7 +20,7 @@
 #ifndef _CHAT_ROOM_P_H_
 #define _CHAT_ROOM_P_H_
 
-#include "chat/is-composing.h"
+#include "chat/notification/is-composing.h"
 #include "chat-room.h"
 #include "object/object-p.h"
 
diff --git a/src/chat/chat-room/chat-room.cpp b/src/chat/chat-room/chat-room.cpp
index c980b6566..315682bdc 100644
--- a/src/chat/chat-room/chat-room.cpp
+++ b/src/chat/chat-room/chat-room.cpp
@@ -22,7 +22,7 @@
 #include "c-wrapper/c-wrapper.h"
 #include "chat/chat-message/chat-message-p.h"
 #include "chat/chat-room/chat-room-p.h"
-#include "chat/imdn.h"
+#include "chat/notification/imdn.h"
 #include "logger/logger.h"
 
 // =============================================================================
diff --git a/src/chat/imdn.cpp b/src/chat/notification/imdn.cpp
similarity index 99%
rename from src/chat/imdn.cpp
rename to src/chat/notification/imdn.cpp
index 66900cb4c..8a63b1966 100644
--- a/src/chat/imdn.cpp
+++ b/src/chat/notification/imdn.cpp
@@ -19,9 +19,9 @@
 
 #include "logger/logger.h"
 
-#include "chat/imdn.h"
-#include "chat/chat-room/chat-room.h"
 #include "chat/chat-message/chat-message.h"
+#include "chat/chat-room/chat-room.h"
+#include "chat/notification/imdn.h"
 
 // =============================================================================
 
diff --git a/src/chat/imdn.h b/src/chat/notification/imdn.h
similarity index 100%
rename from src/chat/imdn.h
rename to src/chat/notification/imdn.h
diff --git a/src/chat/is-composing-listener.h b/src/chat/notification/is-composing-listener.h
similarity index 100%
rename from src/chat/is-composing-listener.h
rename to src/chat/notification/is-composing-listener.h
diff --git a/src/chat/is-composing.cpp b/src/chat/notification/is-composing.cpp
similarity index 99%
rename from src/chat/is-composing.cpp
rename to src/chat/notification/is-composing.cpp
index 93261385b..a488fdb77 100644
--- a/src/chat/is-composing.cpp
+++ b/src/chat/notification/is-composing.cpp
@@ -20,9 +20,9 @@
 #include "linphone/utils/utils.h"
 
 #include "chat/chat-room/chat-room-p.h"
+#include "chat/notification/is-composing.h"
 #include "logger/logger.h"
 
-#include "chat/is-composing.h"
 
 // =============================================================================
 
diff --git a/src/chat/is-composing.h b/src/chat/notification/is-composing.h
similarity index 97%
rename from src/chat/is-composing.h
rename to src/chat/notification/is-composing.h
index 35d281fa3..fda928ae1 100644
--- a/src/chat/is-composing.h
+++ b/src/chat/notification/is-composing.h
@@ -22,7 +22,7 @@
 
 #include "linphone/utils/general.h"
 
-#include "chat/is-composing-listener.h"
+#include "chat/notification/is-composing-listener.h"
 
 #include "private.h"