4 files changed, 7 insertions, 8 deletions
diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp
index a52f719a5b..c3cd59d45b 100644
--- a/plugins/BasicHistory/src/BasicHistory.cpp
+++ b/plugins/BasicHistory/src/BasicHistory.cpp
@@ -59,7 +59,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 	return TRUE;
 }
 
-TIME_API tmi = { 0 };
 int hLangpack = 0;
 
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
@@ -256,10 +255,10 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 
 extern "C" int __declspec(dllexport) Load(void)
 {
+	mir_getLP(&pluginInfo);
+
 	hTaskMainMenu = NULL;
 	DuplicateHandle(GetCurrentProcess(),GetCurrentThread(),GetCurrentProcess(),&g_hMainThread,0,FALSE,DUPLICATE_SAME_ACCESS);
-	mir_getTMI(&tmi);
-	mir_getLP(&pluginInfo);
 
 	hCurSplitNS = LoadCursor(NULL, IDC_SIZENS);
 	hCurSplitWE = LoadCursor(NULL, IDC_SIZEWE);
diff --git a/plugins/BasicHistory/src/EventList.cpp b/plugins/BasicHistory/src/EventList.cpp
index c1c707561e..9bbd8ab243 100644
--- a/plugins/BasicHistory/src/EventList.cpp
+++ b/plugins/BasicHistory/src/EventList.cpp
@@ -366,7 +366,7 @@ void EventList::AddGroup(const EventIndex& ev)
 	TCHAR eventText[256];
 	int i;
 	eventText[0] = 0;
-	tmi.printTimeStamp(NULL, data.timestamp, _T("d t"), eventText, 64, 0);
+	TimeZone_PrintTimeStamp(NULL, data.timestamp, _T("d t"), eventText, 64, 0);
 	std::wstring time = eventText;
 	std::wstring user;
 	if (data.isMe)
diff --git a/plugins/BasicHistory/src/ExportManager.cpp b/plugins/BasicHistory/src/ExportManager.cpp
index 36fc670db7..a1049d87d7 100644
--- a/plugins/BasicHistory/src/ExportManager.cpp
+++ b/plugins/BasicHistory/src/ExportManager.cpp
@@ -333,9 +333,9 @@ void ExportManager::AddGroup(bool isMe, const std::wstring &time, const std::wst
 				}
 			}
 				
-			tmi.printTimeStamp(NULL, data.timestamp, longFormatDate, str , MAXSELECTSTR, 0);
+			TimeZone_PrintTimeStamp(NULL, data.timestamp, longFormatDate, str , MAXSELECTSTR, 0);
 			std::wstring longDate = str;
-			tmi.printTimeStamp(NULL, data.timestamp, formatDate, str , MAXSELECTSTR, 0);
+			TimeZone_PrintTimeStamp(NULL, data.timestamp, formatDate, str , MAXSELECTSTR, 0);
 			std::wstring shortDate = str;
 
 			std::wstring user;
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp
index e01294de40..5fe89953f7 100644
--- a/plugins/BasicHistory/src/HistoryWindow.cpp
+++ b/plugins/BasicHistory/src/HistoryWindow.cpp
@@ -1487,7 +1487,7 @@ void HistoryWindow::SelectEventGroup(int sel)
 				}
 			}
 
-			tmi.printTimeStamp(NULL, data.timestamp, formatDate, str, MAXSELECTSTR, 0);
+			TimeZone_PrintTimeStamp(NULL, data.timestamp, formatDate, str, MAXSELECTSTR, 0);
 			*strLen = (unsigned int)mir_tstrlen(str) * sizeof(TCHAR);
 			TextSelection->SetStart(MAXLONG);
 			TextSelection->GetFont(&TextFont);
@@ -2147,7 +2147,7 @@ void HistoryWindow::FormatQuote(std::wstring& quote, const MessageData& md, cons
 	else
 		quote += contactName;
 	TCHAR str[32];
-	tmi.printTimeStamp(NULL, md.timestamp, _T("d t"), str, 32, 0);
+	TimeZone_PrintTimeStamp(NULL, md.timestamp, _T("d t"), str, 32, 0);
 	quote += _T(", ");
 	quote += str;
 	quote += _T("\n");