diff --git a/conf/msg_conf/map_msg.conf b/conf/msg_conf/map_msg.conf
index ad1910ec1d..ee321b58e8 100644
--- a/conf/msg_conf/map_msg.conf
+++ b/conf/msg_conf/map_msg.conf
@@ -1491,6 +1491,15 @@
 1466: For '%s' you need the amount of seconds (from 0 to 10)
 1467: -- %s unbanall <channel name>
 1468: - unbans everyone from <channel name>
+1469: * %s delete <channel_name>
+1470: -- Force people leave and destroy the specified channel
+1471: * %s list mine
+1472: -- List all your joined channel
+1473: * %s join <channel_name> <channel_password>
+1474: -- join specified channel
+1475: ---- Joined Channels ----
+1476: You have not joined any channel yet
+1477: Channel %s deleted
 
 //Custom translations
 //import: conf/msg_conf/import/map_msg_eng_conf.txt
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 2e0c4de442..820c87c723 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -8793,18 +8793,18 @@ static inline void atcmd_channel_help(struct map_session_data *sd, const char *c
 
 	//option delete
 	if(can_delete){
-		sprintf(atcmd_output, "* %s delete <channel_name>",command);// * %s delete <channel_name>
+		sprintf(atcmd_output, msg_txt(sd,1469),command);// * %s delete <channel_name>
 		clif_displaymessage(fd, atcmd_output);
-		clif_displaymessage(fd, "Force people leave and destroy the specified channel");
+		clif_displaymessage(fd, msg_txt(sd,1470)); // -- Force people leave and destroy the specified channel
 	}
 
 	//option list
 	sprintf(atcmd_output, msg_txt(sd,1417),command);// * %s list
 	clif_displaymessage(fd, atcmd_output);
 	clif_displaymessage(fd, msg_txt(sd,1418));// -- Lists all public channels.
-	sprintf(atcmd_output, "* %s list mine",command);// * %s list mine
+	sprintf(atcmd_output, msg_txt(sd,1471),command);// * %s list mine
 	clif_displaymessage(fd, atcmd_output);
-	clif_displaymessage(fd, "List all your joined channel");
+	clif_displaymessage(fd, msg_txt(sd,1472));
 	if( can_create ) {
 		sprintf(atcmd_output, msg_txt(sd,1419),command);// * %s list colors
 		clif_displaymessage(fd, atcmd_output);
@@ -8819,9 +8819,9 @@ static inline void atcmd_channel_help(struct map_session_data *sd, const char *c
 	}
 
 	//option join
-	sprintf(atcmd_output, "* %s join <channel_name> <channel_password>",command);// * %s join <channel_name>
+	sprintf(atcmd_output, msg_txt(sd,1473),command);// * %s join <channel_name>
 	clif_displaymessage(fd, atcmd_output);
-	clif_displaymessage(fd, "join specified channel");
+	clif_displaymessage(fd, msg_txt(sd,1474));
 
 	//option leave
 	sprintf(atcmd_output, msg_txt(sd,1423),command);// * %s leave <#channel_name>
diff --git a/src/map/channel.c b/src/map/channel.c
index 92b8401749..f908624aa1 100644
--- a/src/map/channel.c
+++ b/src/map/channel.c
@@ -480,9 +480,9 @@ int channel_display_list(struct map_session_data *sd, char *options){
 		}
 	}
 	else if( options[0] != '\0' && strcmpi(options,"mine") == 0 ) { //display chan I'm into
-		clif_displaymessage(sd->fd, " ---- Joined Channels ----"); // ---- Joined Channels ----
+		clif_displaymessage(sd->fd, msg_txt(sd,1475)); // ---- Joined Channels ----
 		if(!sd->channel_count)
-			clif_displaymessage(sd->fd, "You have not joined any channel yet");
+			clif_displaymessage(sd->fd, msg_txt(sd,1476)); //You have not joined any channel yet
 		else {
 			for(k=0; k<sd->channel_count; k++){
 				channel = sd->channels[k];
@@ -575,13 +575,13 @@ int channel_pcdelete(struct map_session_data *sd, char *chname){
 
 	channel = channel_name2channel(chname,sd,0);
 	if(channel_pc_haschan(sd,channel)<0){
-		sprintf(output, "Channel %s doesn't exist",chname);// You're not part of the '%s' channel.
+		sprintf(output, msg_txt(sd,1425),chname);// You're not part of the '%s' channel.
 		clif_displaymessage(sd->fd, output);
 		return -2; //channel doesn't exist or player don't have it
 	}
 	channel_delete(channel);
 
-	sprintf(output, "Channel %s deleted",chname); // You've left the '%s' channel.
+	sprintf(output, msg_txt(sd,1477),chname); //Channel %s deleted
 	clif_displaymessage(sd->fd, output);
 
 	return 0;
@@ -865,7 +865,7 @@ int channel_pcban(struct map_session_data *sd, char *chname, struct map_session_
 		sprintf(output, msg_txt(sd,1443), channel->name);// -- '%s' ban list
 		clif_displaymessage(sd->fd, output);
 		for( pl_sd = dbi_first(iter); dbi_exists(iter); pl_sd = dbi_next(iter) ) { //for all users
-			sprintf(output, "%d: %s",pl_sd->status.char_id,pl_sd->status.name); //  %d: %s
+			sprintf(output, msg_txt(sd,1444),pl_sd->status.char_id,pl_sd->status.name); //  %d: %s
 			clif_displaymessage(sd->fd, output);
 		}
 		dbi_destroy(iter);
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt
index 2e41bc303b..99047336e2 100644
--- a/src/map/sql/CMakeLists.txt
+++ b/src/map/sql/CMakeLists.txt
@@ -42,6 +42,7 @@ set( SQL_MAP_HEADERS
 	"${SQL_MAP_SOURCE_DIR}/unit.h"
 	"${SQL_MAP_SOURCE_DIR}/vending.h"
 	"${SQL_MAP_SOURCE_DIR}/cashshop.h"
+	"${SQL_MAP_SOURCE_DIR}/channel.h"
 	)
 set( SQL_MAP_SOURCES
 	"${SQL_MAP_SOURCE_DIR}/atcommand.c"
@@ -82,6 +83,7 @@ set( SQL_MAP_SOURCES
 	"${SQL_MAP_SOURCE_DIR}/unit.c"
 	"${SQL_MAP_SOURCE_DIR}/vending.c"
 	"${SQL_MAP_SOURCE_DIR}/cashshop.c"
+	"${SQL_MAP_SOURCE_DIR}/channel.c"
 	)
 set( DEPENDENCIES common_sql )
 set( LIBRARIES ${GLOBAL_LIBRARIES} )
diff --git a/vcproj-10/map-server_sql.vcxproj b/vcproj-10/map-server_sql.vcxproj
index f25c8228e5..5d8ab0a38c 100644
--- a/vcproj-10/map-server_sql.vcxproj
+++ b/vcproj-10/map-server_sql.vcxproj
@@ -165,6 +165,7 @@
     <ClInclude Include="..\src\map\battleground.h" />
     <ClInclude Include="..\src\map\buyingstore.h" />
     <ClInclude Include="..\src\map\cashshop.h" />
+    <ClInclude Include="..\src\map\channel.h" />
     <ClInclude Include="..\src\map\chat.h" />
     <ClInclude Include="..\src\map\chrif.h" />
     <ClInclude Include="..\src\map\clif.h" />
@@ -238,6 +239,7 @@
     <ClCompile Include="..\src\map\battleground.c" />
     <ClCompile Include="..\src\map\buyingstore.c" />
     <ClCompile Include="..\src\map\cashshop.c" />
+    <ClCompile Include="..\src\map\channel.c" />
     <ClCompile Include="..\src\map\chat.c" />
     <ClCompile Include="..\src\map\chrif.c" />
     <ClCompile Include="..\src\map\clif.c" />
diff --git a/vcproj-10/map-server_sql.vcxproj.filters b/vcproj-10/map-server_sql.vcxproj.filters
index 1851ccf9d5..83dea5834d 100644
--- a/vcproj-10/map-server_sql.vcxproj.filters
+++ b/vcproj-10/map-server_sql.vcxproj.filters
@@ -16,6 +16,9 @@
     <ClCompile Include="..\src\map\cashshop.c">
       <Filter>map_sql</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\map\channel.c">
+      <Filter>map_sql</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\map\chat.c">
       <Filter>map_sql</Filter>
     </ClCompile>
@@ -213,6 +216,9 @@
     <ClInclude Include="..\src\map\cashshop.h">
       <Filter>map_sql</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\map\channel.h">
+      <Filter>map_sql</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\map\chat.h">
       <Filter>map_sql</Filter>
     </ClInclude>
@@ -428,4 +434,4 @@
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/vcproj-12/map-server_sql.vcxproj b/vcproj-12/map-server_sql.vcxproj
index 3c9e472c43..b21f31a866 100644
--- a/vcproj-12/map-server_sql.vcxproj
+++ b/vcproj-12/map-server_sql.vcxproj
@@ -169,6 +169,7 @@
     <ClInclude Include="..\src\map\battleground.h" />
     <ClInclude Include="..\src\map\buyingstore.h" />
     <ClInclude Include="..\src\map\cashshop.h" />
+    <ClInclude Include="..\src\map\channel.h" />
     <ClInclude Include="..\src\map\chat.h" />
     <ClInclude Include="..\src\map\chrif.h" />
     <ClInclude Include="..\src\map\clif.h" />
@@ -242,6 +243,7 @@
     <ClCompile Include="..\src\map\battleground.c" />
     <ClCompile Include="..\src\map\buyingstore.c" />
     <ClCompile Include="..\src\map\cashshop.c" />
+    <ClCompile Include="..\src\map\channel.c" />
     <ClCompile Include="..\src\map\chat.c" />
     <ClCompile Include="..\src\map\chrif.c" />
     <ClCompile Include="..\src\map\clif.c" />
@@ -298,4 +300,4 @@
     <Copy SourceFiles="..\conf\msg_conf\import-tmpl\map_msg_rus_conf.txt" DestinationFolder="..\conf\msg_conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\msg_conf\import\map_msg_rus_conf.txt')" />
     <Copy SourceFiles="..\conf\msg_conf\import-tmpl\map_msg_spn_conf.txt" DestinationFolder="..\conf\msg_conf\import\" ContinueOnError="true" Condition="!Exists('..\conf\msg_conf\import\map_msg_spn_conf.txt')" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/vcproj-12/map-server_sql.vcxproj.filters b/vcproj-12/map-server_sql.vcxproj.filters
index 60a425dbd3..03be2a77b7 100644
--- a/vcproj-12/map-server_sql.vcxproj.filters
+++ b/vcproj-12/map-server_sql.vcxproj.filters
@@ -12,6 +12,12 @@
     </ClCompile>
     <ClCompile Include="..\src\map\buyingstore.c">
       <Filter>map_sql</Filter>
+    </ClCompile>  
+    <ClCompile Include="..\src\map\channel.c">
+      <Filter>map_sql</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\map\cashshop.c">
+      <Filter>map_sql</Filter>
     </ClCompile>
     <ClCompile Include="..\src\map\chat.c">
       <Filter>map_sql</Filter>
@@ -193,10 +199,11 @@
     <ClCompile Include="..\src\common\raconf.c">
       <Filter>common</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\common\cli.c" />
-    <ClCompile Include="..\src\common\msg_conf.c" />
-    <ClCompile Include="..\src\map\cashshop.c">
-      <Filter>map_sql</Filter>
+    <ClCompile Include="..\src\common\cli.c">
+		<Filter>common</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\msg_conf.c">
+		<Filter>common</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -212,6 +219,12 @@
     <ClInclude Include="..\src\map\buyingstore.h">
       <Filter>map_sql</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\map\channel.h">
+      <Filter>map_sql</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\map\cashshop.h">
+      <Filter>map_sql</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\map\chat.h">
       <Filter>map_sql</Filter>
     </ClInclude>
@@ -409,10 +422,11 @@
     <ClInclude Include="..\src\common\raconf.h">
       <Filter>common</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\common\cli.h" />
-    <ClInclude Include="..\src\common\msg_conf.h" />
-    <ClInclude Include="..\src\map\cashshop.h">
-      <Filter>map_sql</Filter>
+    <ClInclude Include="..\src\common\cli.h">
+	 <Filter>common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\msg_conf.h">
+		<Filter>common</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
@@ -432,4 +446,4 @@
       <UniqueIdentifier>{9caf40b7-c4d1-43b4-bd1f-0376b4f920e7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/vcproj-9/map-server_sql.vcproj b/vcproj-9/map-server_sql.vcproj
index df360ae923..14573f2e5a 100644
--- a/vcproj-9/map-server_sql.vcproj
+++ b/vcproj-9/map-server_sql.vcproj
@@ -512,6 +512,14 @@
 				RelativePath="..\src\map\cashshop.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\map\channel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\map\channel.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\map\chat.c"
 				>