diff --git a/gajim/common/config.py b/gajim/common/config.py
index 7b0caefcd..687f60e6c 100644
--- a/gajim/common/config.py
+++ b/gajim/common/config.py
@@ -153,6 +153,10 @@ class Config:
             'gc-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
             'gc-msgwin-width': [opt_int, 600],
             'gc-msgwin-height': [opt_int, 440],
+            'pm-msgwin-x-position': [opt_int, -1], # Default is to let the window manager decide
+            'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide
+            'pm-msgwin-width': [opt_int, 480],
+            'pm-msgwin-height': [opt_int, 440],
             'single-msg-x-position': [opt_int, 0],
             'single-msg-y-position': [opt_int, 0],
             'single-msg-width': [opt_int, 400],
diff --git a/gajim/message_window.py b/gajim/message_window.py
index c05ce2420..110566566 100644
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -1019,8 +1019,6 @@ class MessageWindowMgr(GObject.GObject):
             size = (gajim.config.get_per('accounts', acct, 'msgwin-width'),
                     gajim.config.get_per('accounts', acct, 'msgwin-height'))
         elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE):
-            if type_ == message_control.TYPE_PM:
-                type_ = message_control.TYPE_CHAT
             opt_width = type_ + '-msgwin-width'
             opt_height = type_ + '-msgwin-height'
             size = (gajim.config.get(opt_width), gajim.config.get(opt_height))