diff --git a/src/chat_control.py b/src/chat_control.py
index f9c25a917..82e76867e 100644
--- a/src/chat_control.py
+++ b/src/chat_control.py
@@ -34,7 +34,7 @@ from message_textview import MessageTextView
 from common.contacts import GC_Contact
 from common.logger import Constants
 constants = Constants()
-from rst_xhtml_generator import create_xhtml
+from common.rst_xhtml_generator import create_xhtml
 from common.xmpp.protocol import NS_XHTML
 
 try:
diff --git a/src/common/connection.py b/src/common/connection.py
index eca1b6483..783fa893d 100644
--- a/src/common/connection.py
+++ b/src/common/connection.py
@@ -35,7 +35,7 @@ from common import passwords
 from connection_handlers import *
 USE_GPG = GnuPG.USE_GPG
 
-from rst_xhtml_generator import create_xhtml
+from common.rst_xhtml_generator import create_xhtml
 
 class Connection(ConnectionHandlers):
 	'''Connection class'''
diff --git a/src/rst_xhtml_generator.py b/src/common/rst_xhtml_generator.py
similarity index 100%
rename from src/rst_xhtml_generator.py
rename to src/common/rst_xhtml_generator.py