StatusManager: Resource fixes

2 files changed, 164 insertions, 84 deletions

diff --git a/plugins/StatusManager/res/resource.rc b/plugins/StatusManager/res/resource.rc
index 730ac2a883..570ab1d39d 100644
--- a/plugins/StatusManager/res/resource.rc
+++ b/plugins/StatusManager/res/resource.rc
@@ -27,7 +27,7 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
 
 1 TEXTINCLUDE 
 BEGIN
-"..\\src\\resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -44,13 +44,18 @@ END
 
 #endif    // APSTUDIO_INVOKED
 
+
 /////////////////////////////////////////////////////////////////////////////
 //
-// Bitmap
+// Icon
 //
 
-IDI_TTBDOWN             ICON                    "res\\ttbDown.ico"
-IDI_TTBUP               ICON                    "res\\ttbUp.ico"
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_TTBDOWN             ICON                    "ttbDown.ico"
+
+IDI_TTBUP               ICON                    "ttbUp.ico"
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -62,23 +67,23 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
+    GROUPBOX        "General",IDC_STATIC,3,0,286,30
+    CONTROL         "Show popups",IDC_SHOWCONNECTIONPOPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,12,270,10
+    GROUPBOX        "Account connection",IDC_STATIC,3,32,286,116
     CONTROL         "Check connection",IDC_CHECKCONNECTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,51,162,10
     EDITTEXT        IDC_MAXRETRIES,21,70,22,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "Maximum retries (0 - infinite)",IDC_STATIC,47,73,129,14
-    GROUPBOX        "Account connection",IDC_STATIC,3,32,286,116
     EDITTEXT        IDC_INITDELAY,21,92,22,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Delay between retries (secs)",IDC_STATIC,47,95,130,17
-    CONTROL         "Show popups",IDC_SHOWCONNECTIONPOPUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,12,269,10
-    GROUPBOX        "General",IDC_STATIC,3,0,286,30
+    LTEXT           "Delay between retries (secs)",IDC_STATIC,47,95,129,17
     CONTROL         "",IDC_PROTOCOLLIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,180,52,101,92
-    CTEXT           "Accounts to check",IDC_STATIC,180,41,96,8
+    CTEXT           "Accounts to check",IDC_STATIC,180,41,101,8
     GROUPBOX        "Dial-Up",IDC_STATIC,4,149,285,69
     CONTROL         "Don't reconnect if no internet connection seems available",IDC_CHKINET,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,265,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,161,270,8
     CONTROL         "Continuously check for internet connection",IDC_CONTCHECK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,265,8
-    CONTROL         "Do so by pinging host",IDC_BYPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,188,256,8
-    EDITTEXT        IDC_PINGHOST,36,198,237,14,ES_AUTOHSCROLL
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,270,8
+    CONTROL         "Do so by pinging host",IDC_BYPING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,188,260,8
+    EDITTEXT        IDC_PINGHOST,36,198,245,14,ES_AUTOHSCROLL
 END
 
 IDD_CONFIRMDIALOG DIALOGEX 0, 0, 257, 121
@@ -101,27 +106,27 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    RTEXT           "Account",IDC_STATIC,93,11,78,8
+    RTEXT           "Account",IDC_STATIC,16,11,155,8
     COMBOBOX        IDC_PROTOCOL,177,9,100,138,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     RTEXT           "Set",IDC_STATIC,5,41,33,8
     COMBOBOX        IDC_LV1STATUS,41,39,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    CONTROL         "when full-screen mode is active",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,152,10
-    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,73,152,10
-    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,153,10
+    CONTROL         "when full-screen mode is active",IDC_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,60,155,10
+    CONTROL         "when screen saver engages",IDC_SCREENSAVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,73,155,10
+    CONTROL         "when workstation is locked",IDC_ONLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,86,155,10
     CONTROL         "after",IDC_TIMED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,32,8
     EDITTEXT        IDC_AWAYTIME,51,98,26,12,ES_AUTOHSCROLL
-    LTEXT           "minutes of inactivity",IDC_LV1AFTERSTR,82,100,87,8
+    LTEXT           "minutes of inactivity",IDC_LV1AFTERSTR,82,100,89,8
     RTEXT           "Set",IDC_STATIC,5,115,33,8
     COMBOBOX        IDC_LV2STATUS,41,113,65,101,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "after",IDC_SETNA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,131,32,8
     EDITTEXT        IDC_NATIME,51,129,26,12,ES_AUTOHSCROLL
-    LTEXT           "minutes of level 1 mode",IDC_SETNASTR,82,131,86,8
-    CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,143,151,10
+    LTEXT           "minutes of level 1 mode",IDC_SETNASTR,82,131,89,8
+    CONTROL         "only set when inactive",IDC_LV2ONINACTIVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,143,261,10
     CONTROL         "Monitor Miranda's activity only",IDC_MONITORMIRANDA,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,155,168,12
-    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,168,168,11
-    CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,181,168,10
-    LTEXT           "Only set if current status is",IDC_STATIC,180,42,95,8
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,155,268,12
+    CONTROL         "Reset status on return",IDC_RESETSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,168,268,11
+    CONTROL         "Confirm resetting status",IDC_CONFIRM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,9,181,268,10
+    LTEXT           "Only set if current status is",IDC_STATIC,177,42,100,8
     CONTROL         "",IDC_STATUSLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,177,55,100,84
 END
 
@@ -172,14 +177,14 @@ BEGIN
     LTEXT           "Timeout",IDC_STATIC,26,89,30,8
     LTEXT           "s",IDC_STATIC,88,89,12,8
     CONTROL         "Set window location",IDC_SETWINLOCATION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,82,80,10
-	LTEXT           "Left",IDC_STATIC,214,97,35,8
+    LTEXT           "Left",IDC_STATIC,214,97,35,8
     EDITTEXT        IDC_XPOS,259,94,30,14,ES_AUTOHSCROLL | ES_NUMBER
-	LTEXT           "Top",IDC_STATIC,214,113,35,8
+    LTEXT           "Top",IDC_STATIC,214,113,35,8
     EDITTEXT        IDC_YPOS,259,110,30,14,ES_AUTOHSCROLL | ES_NUMBER
     CONTROL         "Set window size",IDC_SETWINSIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,209,140,80,10
-	LTEXT           "Width",IDC_STATIC,214,155,35,8
-	EDITTEXT        IDC_WIDTH,259,152,30,14,ES_AUTOHSCROLL | ES_NUMBER
-	LTEXT           "Height",IDC_STATIC,214,171,35,8
+    LTEXT           "Width",IDC_STATIC,214,155,35,8
+    EDITTEXT        IDC_WIDTH,259,152,30,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Height",IDC_STATIC,214,171,35,8
     EDITTEXT        IDC_HEIGHT,259,168,30,14,ES_AUTOHSCROLL | ES_NUMBER
     COMBOBOX        IDC_PROFILE,105,19,78,92,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "Allow override",IDC_OVERRIDE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,53,76,10
@@ -192,41 +197,41 @@ BEGIN
     GROUPBOX        "Dial-up (experimental)",IDC_STATIC,7,113,182,49
 END
 
-IDD_PUOPT_KEEPSTATUS DIALOGEX 0, 0, 254, 223
+IDD_PUOPT_KEEPSTATUS DIALOGEX 0, 0, 264, 223
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "",IDC_BGCOLOR,"ColourPicker",WS_TABSTOP,15,19,35,14
-    LTEXT           "Background color",IDC_STATIC,59,23,66,8
+    LTEXT           "Background color",IDC_STATIC,59,23,69,8
     CONTROL         "",IDC_TEXTCOLOR,"ColourPicker",WS_TABSTOP,15,37,35,14
-    LTEXT           "Text color",IDC_STATIC,59,41,66,8
-    CONTROL         "Use Windows colors",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,108,10
-    CONTROL         "Use default colors",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,107,10
-    GROUPBOX        "Delay",IDC_STATIC,137,7,110,52
-    EDITTEXT        IDC_DELAY,221,30,20,14,ES_AUTOHSCROLL | ES_NUMBER
-    GROUPBOX        "On left click",IDC_STATIC,7,84,103,51
-    GROUPBOX        "On right click",IDC_STATIC,137,84,101,51,WS_GROUP
-    CONTROL         "Do nothing",IDC_LNOTHING,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,96,80,10
-    CONTROL         "Close popup",IDC_LCLOSE,"Button",BS_AUTORADIOBUTTON,15,108,79,10
-    CONTROL         "Cancel reconnecting",IDC_LCANCEL,"Button",BS_AUTORADIOBUTTON,15,120,94,10
-    CONTROL         "Do nothing",IDC_RNOTHING,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,96,78,10
-    CONTROL         "Close popup",IDC_RCLOSE,"Button",BS_AUTORADIOBUTTON,143,108,78,10
-    CONTROL         "Cancel reconnecting",IDC_RCANCEL,"Button",BS_AUTORADIOBUTTON,143,120,94,10
+    LTEXT           "Text color",IDC_STATIC,59,41,69,8
+    CONTROL         "Use Windows colors",IDC_WINCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,56,113,10
+    CONTROL         "Use default colors",IDC_DEFAULTCOLORS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,66,113,10
+    GROUPBOX        "Delay",IDC_STATIC,137,7,122,52
+    EDITTEXT        IDC_DELAY,234,30,20,14,ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "On left click",IDC_STATIC,7,84,126,51
+    GROUPBOX        "On right click",IDC_STATIC,137,84,122,51,WS_GROUP
+    CONTROL         "Do nothing",IDC_LNOTHING,"Button",BS_AUTORADIOBUTTON | WS_GROUP,15,96,113,10
+    CONTROL         "Close popup",IDC_LCLOSE,"Button",BS_AUTORADIOBUTTON,15,108,113,10
+    CONTROL         "Cancel reconnecting",IDC_LCANCEL,"Button",BS_AUTORADIOBUTTON,15,120,113,10
+    CONTROL         "Do nothing",IDC_RNOTHING,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,96,111,10
+    CONTROL         "Close popup",IDC_RCLOSE,"Button",BS_AUTORADIOBUTTON,143,108,111,10
+    CONTROL         "Cancel reconnecting",IDC_RCANCEL,"Button",BS_AUTORADIOBUTTON,143,120,111,10
     GROUPBOX        "Colors",IDC_STATIC,7,7,126,73
     PUSHBUTTON      "Preview",IDC_PREV,137,63,50,14
-    GROUPBOX        "Events",IDC_STATIC,7,140,240,76
-    CONTROL         "Show when connection is lost",IDC_PUCONNLOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,153,226,10
+    GROUPBOX        "Events",IDC_STATIC,7,140,252,76
+    CONTROL         "Show when connection is lost",IDC_PUCONNLOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,153,239,10
     CONTROL         "Show when a connection attempt is made",IDC_PUCONNRETRY,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,226,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,165,239,10
     CONTROL         "Show when reconnection has finished",IDC_PURESULT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,226,10
-    CONTROL         "Show other messages",IDC_PUOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,189,226,10
-    CONTROL         "From popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,94,10
-    CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,143,32,47,10
-    CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,143,45,50,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,177,239,10
+    CONTROL         "Show other messages",IDC_PUOTHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,189,239,10
+    CONTROL         "From popup plugin",IDC_DELAYFROMPU,"Button",BS_AUTORADIOBUTTON | WS_GROUP,143,19,111,10
+    CONTROL         "Custom",IDC_DELAYCUSTOM,"Button",BS_AUTORADIOBUTTON,143,32,85,10
+    CONTROL         "Permanent",IDC_DELAYPERMANENT,"Button",BS_AUTORADIOBUTTON,143,45,111,10
     CONTROL         "Show additional information in popups",IDC_PUSHOWEXTRA,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,201,226,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,201,239,10
 END
 
 IDD_OPT_AUTOAWAYMSG DIALOGEX 0, 0, 263, 153
@@ -242,28 +247,28 @@ BEGIN
     PUSHBUTTON      "Variables...",IDC_VARIABLESHELP,198,65,54,14,NOT WS_VISIBLE
 END
 
-IDD_OPT_GENAUTOAWAY DIALOGEX 0, 0, 258, 191
+IDD_OPT_GENAUTOAWAY DIALOGEX 0, 0, 281, 191
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "Specify settings for each account",IDC_PERPROTOCOLSETTINGS,
-                    "Button",BS_AUTORADIOBUTTON,20,20,220,10
+                    "Button",BS_AUTORADIOBUTTON,7,20,255,10
     CONTROL         "Use same settings for all accounts",IDC_SAMESETTINGS,
-                    "Button",BS_AUTORADIOBUTTON,20,31,220,10
+                    "Button",BS_AUTORADIOBUTTON,7,31,255,10
     CONTROL         "Ignore Caps Lock, Num Lock and Scroll Lock keys",IDC_IGNLOCK,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,44,220,10
-    LTEXT           "Check interval (secs)",IDC_STATIC,21,125,133,8
-    EDITTEXT        IDC_AWAYCHECKTIMEINSECS,159,122,22,14,ES_AUTOHSCROLL
-    LTEXT           "Confirm dialog timeout (secs)",IDC_STATIC,21,142,133,8
-    EDITTEXT        IDC_CONFIRMDELAY,159,138,22,14,ES_AUTOHSCROLL
-    CTEXT           "You enabled ""Change my status mode to"" in the ""Idle"" options dialog, AdvancedAutoAway's options are ignored.",IDC_IDLEWARNING,7,164,244,20,NOT WS_VISIBLE
-    CONTROL         "Monitor keyboard activity",IDC_MONITORKEYBOARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,77,220,10
-    CONTROL         "Monitor mouse activity",IDC_MONITORMOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,88,220,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,44,255,10
+    RTEXT           "Check interval (secs)",IDC_STATIC,7,125,227,8
+    EDITTEXT        IDC_AWAYCHECKTIMEINSECS,240,122,22,14,ES_AUTOHSCROLL
+    RTEXT           "Confirm dialog timeout (secs)",IDC_STATIC,7,142,227,8
+    EDITTEXT        IDC_CONFIRMDELAY,240,138,22,14,ES_AUTOHSCROLL
+    CTEXT           "You enabled ""Change my status mode to"" in the ""Idle"" options dialog, AdvancedAutoAway's options are ignored.",IDC_IDLEWARNING,7,164,255,20,NOT WS_VISIBLE
+    CONTROL         "Monitor keyboard activity",IDC_MONITORKEYBOARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,77,255,10
+    CONTROL         "Monitor mouse activity",IDC_MONITORMOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,88,255,10
     CONTROL         "Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys",IDC_IGNSYSKEYS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,55,220,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,55,255,10
     CONTROL         "Ignore any key combination with above keys",IDC_IGNALTCOMBO,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,66,220,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,66,255,10
 END
 
 IDD_OPT_KS_ACTION DIALOGEX 0, 0, 140, 162
@@ -327,31 +332,31 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_MAXDELAY,11,32,22,14,ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "Timers",IDC_STATIC,3,2,284,54
     LTEXT           "Max. delay (secs)",IDC_STATIC,39,35,84,8
+    EDITTEXT        IDC_MAXDELAY,11,32,22,14,ES_AUTOHSCROLL | ES_NUMBER
+    LTEXT           "Max. account connecting time (secs)",IDC_STATIC,154,35,121,19
+    EDITTEXT        IDC_MAXCONNECTINGTIME,127,32,22,14,ES_AUTOHSCROLL | ES_NUMBER
+    GROUPBOX        "Reconnecting",IDC_STATIC,4,58,283,106
+    CONTROL         "Ignore locked status of accounts",IDC_NOLOCKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,72,272,10
     CONTROL         "Increase delay exponential",IDC_INCREASEEXPONENTIAL,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,14,263,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,14,272,10
+    CONTROL         "Set account offline before a connection attempt",IDC_FIRSTOFFLINE,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,84,272,10
     CONTROL         "Cancel all if an account connects from another location",IDC_CNCOTHERLOC,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,96,234,10
-    CONTROL         "Reconnect on APM resume",IDC_CHECKAPMRESUME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,108,234,10
-    CONTROL         "Stop trying to reconnect",IDC_LOGINERR_CANCEL,"Button",BS_AUTORADIOBUTTON,22,132,169,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,96,272,10
+    CONTROL         "Reconnect on APM resume",IDC_CHECKAPMRESUME,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,108,272,10
+    CONTROL         "React on login errors",IDC_LOGINERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,120,272,10
+    CONTROL         "Stop trying to reconnect",IDC_LOGINERR_CANCEL,"Button",BS_AUTORADIOBUTTON,22,132,261,10
     CONTROL         "Set delay to",IDC_LOGINERR_SETDELAY,"Button",BS_AUTORADIOBUTTON,22,143,110,12
-    CONTROL         "React on login errors",IDC_LOGINERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,120,234,10
-    EDITTEXT        IDC_LOGINERR_DELAY,136,142,22,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "seconds",IDC_STATIC,164,145,77,8
-    CONTROL         "Set account offline before a connection attempt",IDC_FIRSTOFFLINE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,84,234,10
-    EDITTEXT        IDC_MAXCONNECTINGTIME,127,32,22,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Max. account connecting time (secs)",IDC_STATIC,154,35,121,19
-    GROUPBOX        "Timers",IDC_STATIC,3,2,284,54
-    GROUPBOX        "Reconnecting",IDC_STATIC,4,58,283,106
-    CONTROL         "Ignore locked status of accounts",IDC_NOLOCKED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,72,234,10
+    EDITTEXT        IDC_LOGINERR_DELAY,136,142,22,14,ES_AUTOHSCROLL | ES_NUMBER
     GROUPBOX        "Dial-Up",IDC_STATIC,5,166,282,51
     LTEXT           "Consider connection lost after",IDC_STATIC,12,180,122,8
     EDITTEXT        IDC_PINGCOUNT,135,177,22,14,ES_AUTOHSCROLL | ES_NUMBER
     LTEXT           "failed pings",IDC_STATIC,160,180,101,8
+    LTEXT           "Continuously check interval (secs)",IDC_STATIC,36,196,247,8
     EDITTEXT        IDC_CNTDELAY,11,193,22,14,ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "Continuously check interval (secs)",IDC_STATIC,36,196,160,8
 END
 
 IDD_TRG_AAASTATECHANGE DIALOGEX 0, 0, 212, 144
@@ -382,10 +387,52 @@ GUIDELINES DESIGNINFO
 BEGIN
     IDD_OPT_KS_BASIC, DIALOG
     BEGIN
+        VERTGUIDE, 11
+        VERTGUIDE, 21
+        VERTGUIDE, 36
+        VERTGUIDE, 43
+        VERTGUIDE, 47
+        VERTGUIDE, 176
+        VERTGUIDE, 180
+        VERTGUIDE, 281
     END
 
     IDD_OPT_AUTOAWAY, DIALOG
     BEGIN
+        VERTGUIDE, 9
+        VERTGUIDE, 16
+        VERTGUIDE, 171
+        VERTGUIDE, 177
+        VERTGUIDE, 277
+    END
+
+    IDD_PUOPT_KEEPSTATUS, DIALOG
+    BEGIN
+        RIGHTMARGIN, 254
+        VERTGUIDE, 7
+        VERTGUIDE, 15
+        VERTGUIDE, 50
+        VERTGUIDE, 59
+        VERTGUIDE, 128
+        VERTGUIDE, 133
+        VERTGUIDE, 137
+        VERTGUIDE, 143
+        VERTGUIDE, 254
+        VERTGUIDE, 259
+    END
+
+    IDD_OPT_AUTOAWAYMSG, DIALOG
+    BEGIN
+    END
+
+    IDD_OPT_GENAUTOAWAY, DIALOG
+    BEGIN
+        RIGHTMARGIN, 277
+        VERTGUIDE, 7
+        VERTGUIDE, 234
+        VERTGUIDE, 240
+        VERTGUIDE, 262
+        VERTGUIDE, 267
     END
 
     IDD_OPT_TABS, DIALOG
@@ -395,11 +442,44 @@ BEGIN
 
     IDD_OPT_KS_ADV, DIALOG
     BEGIN
+        VERTGUIDE, 11
+        VERTGUIDE, 283
     END
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // German (Germany) resources
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_OPT_KS_ADV AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_OPT_AUTOAWAY AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_OPT_GENAUTOAWAY AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_OPT_KS_BASIC AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+IDD_PUOPT_KEEPSTATUS AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+#endif    // Deutsch (Deutschland) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/plugins/StatusManager/src/aaa_msgoptions.cpp b/plugins/StatusManager/src/aaa_msgoptions.cpp
index 7bf788aa9b..5647199a43 100644
--- a/plugins/StatusManager/src/aaa_msgoptions.cpp
+++ b/plugins/StatusManager/src/aaa_msgoptions.cpp
@@ -126,8 +126,8 @@ INT_PTR CALLBACK DlgProcAutoAwayMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 					if (settings[i]->msg != NULL)
 						SetDlgItemTextA(hwndDlg, IDC_STATUSMSG, settings[i]->msg);
 					else {
-						ptrW msg((wchar_t*)CallService(MS_AWAYMSG_GETSTATUSMSGW, settings[i]->status, 0));
-						SetDlgItemText(hwndDlg, IDC_STATUSMSG, (msg != NULL) ? msg : L"");
+						ptrW msgw((wchar_t*)CallService(MS_AWAYMSG_GETSTATUSMSGW, settings[i]->status, 0));
+						SetDlgItemText(hwndDlg, IDC_STATUSMSG, (msgw != NULL) ? msgw : L"");
 					}
 
 					if (settings[i]->useCustom) {