IEView:

code formating

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@270 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

22 files changed, 1162 insertions, 1169 deletions

diff --git a/IEView/ChatHTMLBuilder.cpp b/IEView/ChatHTMLBuilder.cpp
index e7b0e43..22ab173 100644
--- a/IEView/ChatHTMLBuilder.cpp
+++ b/IEView/ChatHTMLBuilder.cpp
@@ -38,7 +38,7 @@ static const char *classNames[] = {
 	".timestamp", ".nameIn", ".nameOut", ".userJoined", ".userLeft", ".userDisconnected",

 	".userKicked", ".nickChange", ".notice",

 	".messageIn", ".messageOut", ".topicChange", ".information", ".statusEnable", ".statusDisable",

-    ".action", ".highlight"

+	".action", ".highlight"

 };

 

 ChatHTMLBuilder::ChatHTMLBuilder() {

@@ -47,45 +47,45 @@ ChatHTMLBuilder::ChatHTMLBuilder() {
 }

 

 void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) {

-    char str[32];

-    int style;

-    DBVARIANT dbv;

-    if (colour) {

-        wsprintfA(str, "Font%dCol", i);

-        *colour = DBGetContactSettingDword(NULL, CHATFONTMOD, str, 0x000000);

-    }

-    if (lf) {

-        wsprintfA(str, "Font%dSize", i);

-        lf->lfHeight = (char) DBGetContactSettingByte(NULL, CHATFONTMOD, str, 10);

-        lf->lfHeight = abs(lf->lfHeight);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "Font%dSty", i);

-        style = DBGetContactSettingByte(NULL, CHATFONTMOD, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "Font%dSet", i);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, CHATFONTMOD, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "Font%d", i);

-        if (DBGetContactSetting(NULL, CHATFONTMOD, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[32];

+	int style;

+	DBVARIANT dbv;

+	if (colour) {

+		wsprintfA(str, "Font%dCol", i);

+		*colour = DBGetContactSettingDword(NULL, CHATFONTMOD, str, 0x000000);

+	}

+	if (lf) {

+		wsprintfA(str, "Font%dSize", i);

+		lf->lfHeight = (char) DBGetContactSettingByte(NULL, CHATFONTMOD, str, 10);

+		lf->lfHeight = abs(lf->lfHeight);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "Font%dSty", i);

+		style = DBGetContactSettingByte(NULL, CHATFONTMOD, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "Font%dSet", i);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, CHATFONTMOD, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "Font%d", i);

+		if (DBGetContactSetting(NULL, CHATFONTMOD, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 char *ChatHTMLBuilder::timestampToString(time_t time)

 {

-    static char szResult[512];

+	static char szResult[512];

 	static char str[80];

 	char *pszStamp = "[%H:%M]";

 	//InitSetting( &g_Settings.pszTimeStamp, "HeaderTime", _T("[%H:%M]"));

@@ -103,29 +103,29 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 	if (protoSettings == NULL) {

 		return;

 	}

- 	if (protoSettings->getChatMode() == Options::MODE_TEMPLATE) {

+	if (protoSettings->getChatMode() == Options::MODE_TEMPLATE) {

 //		buildHeadTemplate(view, event);

 		return;

 	}

- 	if (protoSettings->getChatMode() == Options::MODE_CSS) {

-	 	const char *externalCSS = protoSettings->getChatCssFilename();

-        Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

+	if (protoSettings->getChatMode() == Options::MODE_CSS) {

+		const char *externalCSS = protoSettings->getChatCssFilename();

+		Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

 	} else {

 		HDC hdc = GetDC(NULL);

-	    int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 		Utils::appendText(&output, &outputSize, "<html><head>");

 		Utils::appendText(&output, &outputSize, "<style type=\"text/css\">\n");

 		COLORREF bkgColor = DBGetContactSettingDword(NULL, CHATMOD, "BackgroundLog", 0xFFFFFF);

 		COLORREF inColor, outColor;

-	    bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

+		bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

 		inColor = outColor = bkgColor;

 		if (protoSettings->getChatFlags() & Options::LOG_IMAGE_ENABLED) {

 			Utils::appendText(&output, &outputSize, ".body {padding: 2px; text-align: left; background-attachment: %s; background-color: #%06X;  background-image: url('%s'); overflow: auto;}\n",

 			protoSettings->getChatFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getChatBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+						(int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {vertical-align: middle;}\n");

@@ -149,7 +149,7 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 	setLastEventType(-1);

@@ -160,9 +160,8 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
  */

 

 void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {

-

 	DWORD iconFlags = DBGetContactSettingDword(NULL, CHATMOD, CHAT_ICON_FLAGS, 0);

-    IEVIEWEVENTDATA* eventData = event->eventData;

+	IEVIEWEVENTDATA* eventData = event->eventData;

 	for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) {

 		//DWORD dwFlags = eventData->dwFlags;

 		const char *iconFile = "";

@@ -191,37 +190,37 @@ void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 		} else {

 			if (eventData->iType == IEED_GC_EVENT_ACTION) {

 				iconFile = "action.gif";

-                className = "action";

+				className = "action";

 			} else if (eventData->iType == IEED_GC_EVENT_JOIN) {

 				iconFile = "join.gif";

-                className = "userJoined";

+				className = "userJoined";

 			} else if (eventData->iType == IEED_GC_EVENT_PART) {

 				iconFile = "part.gif";

-                className = "userLeft";

+				className = "userLeft";

 			} else if (eventData->iType == IEED_GC_EVENT_QUIT) {

 				iconFile = "quit.gif";

-                className = "userDisconnected";

+				className = "userDisconnected";

 			} else if (eventData->iType == IEED_GC_EVENT_NICK) {

 				iconFile = "nick.gif";

-                className = "nickChange";

+				className = "nickChange";

 			} else if (eventData->iType == IEED_GC_EVENT_KICK) {

 				iconFile = "kick.gif";

-                className = "userKicked";

+				className = "userKicked";

 			} else if (eventData->iType == IEED_GC_EVENT_NOTICE) {

 				iconFile = "notice.gif";

-                className = "notice";

+				className = "notice";

 			} else if (eventData->iType == IEED_GC_EVENT_TOPIC) {

 				iconFile = "topic.gif";

-                className = "topicChange";

+				className = "topicChange";

 			} else if (eventData->iType == IEED_GC_EVENT_ADDSTATUS) {

 				iconFile = "addstatus.gif";

-                className = "statusEnable";

+				className = "statusEnable";

 			} else if (eventData->iType == IEED_GC_EVENT_REMOVESTATUS) {

 				iconFile = "removestatus.gif";

-                className = "statusDisable";

+				className = "statusDisable";

 			} else if (eventData->iType == IEED_GC_EVENT_INFORMATION) {

 				iconFile = "info.gif";

-                className = "information";

+				className = "information";

 			}

 		}

 		Utils::appendText(&output, &outputSize, "<div class=\"%s\">", isSent ? "divOut" : "divIn");

@@ -241,14 +240,14 @@ void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 		}

 		Utils::appendText(&output, &outputSize, "<span class=\"%s\">", className);

 		Utils::appendText(&output, &outputSize, "%s", szText);

-        Utils::appendText(&output, &outputSize, "</span></div>\n");

+		Utils::appendText(&output, &outputSize, "</span></div>\n");

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

 		if (szName!=NULL) delete szName;

 		if (szText!=NULL) delete szText;

-    }

+	}

 }

 

 void ChatHTMLBuilder::appendEvent(IEView *view, IEVIEWEVENT *event) {

diff --git a/IEView/ChatHTMLBuilder.h b/IEView/ChatHTMLBuilder.h
index 99b9a65..94f02bf 100644
--- a/IEView/ChatHTMLBuilder.h
+++ b/IEView/ChatHTMLBuilder.h
@@ -28,12 +28,12 @@ class ChatHTMLBuilder;
 class ChatHTMLBuilder:public HTMLBuilder

 {

 protected:

-    void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

+	void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

 	char *timestampToString(time_t time);

 	void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);

 	bool isDbEventShown(DBEVENTINFO * dbei);

 public:

-    ChatHTMLBuilder();

+	ChatHTMLBuilder();

 	void buildHead(IEView *, IEVIEWEVENT *event);

 	void appendEvent(IEView *, IEVIEWEVENT *event);

 };

diff --git a/IEView/HTMLBuilder.cpp b/IEView/HTMLBuilder.cpp
index 5a1fe08..7c83609 100644
--- a/IEView/HTMLBuilder.cpp
+++ b/IEView/HTMLBuilder.cpp
@@ -64,15 +64,15 @@ bool HTMLBuilder::encode(HANDLE hContact, const char *proto, const wchar_t *text
 	case 2:

 		if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_MATHMODULE) && Options::isMathModule()) {

 			token = TextToken::tokenizeMath(text);

-            break;

-    	}

+			break;

+		}

 		level++;

 	case 3:

 		token = TextToken::tokenizeLinks(text);

 		break;

 	case 4:

 		if ((flags & ENF_SMILEYS) ||

-      			((Options::getGeneralFlags() & Options::GENERAL_SMILEYINNAMES) &&  (flags & ENF_NAMESMILEYS))) {

+				((Options::getGeneralFlags() & Options::GENERAL_SMILEYINNAMES) &&  (flags & ENF_NAMESMILEYS))) {

 			token = TextToken::tokenizeSmileys(hContact, proto, text, isSent);

 		}

 		break;

@@ -95,7 +95,7 @@ bool HTMLBuilder::encode(HANDLE hContact, const char *proto, const wchar_t *text
 }

 

 wchar_t * HTMLBuilder::encode(HANDLE hContact, const char *proto, const wchar_t *text, int flags, bool isSent) {

- 	int outputSize;

+	int outputSize;

 	wchar_t *output = NULL;

 	if (text != NULL) {

 		encode(hContact, proto, text, &output, &outputSize, 0, flags, isSent);

@@ -103,7 +103,6 @@ wchar_t * HTMLBuilder::encode(HANDLE hContact, const char *proto, const wchar_t
 	return output;

 }

 

-

 char * HTMLBuilder::encodeUTF8(HANDLE hContact, const char *proto, const wchar_t *wtext, int flags, bool isSent) {

 	char *outputStr = NULL;

 	if (wtext != NULL) {

@@ -173,14 +172,13 @@ char *HTMLBuilder::getRealProto(HANDLE hContact, const char *szProto) {
 }

 

 HANDLE HTMLBuilder::getRealContact(HANDLE hContact) {

-    char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

+	char *szProto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);

 	if (szProto != NULL && !strcmp(szProto,"MetaContacts")) {

 		hContact = (HANDLE) CallService(MS_MC_GETMOSTONLINECONTACT, (WPARAM) hContact, 0);

 	}

 	return hContact;

 }

 

-

 int HTMLBuilder::getLastEventType() {

 	return iLastEventType;

 }

@@ -198,10 +196,10 @@ void HTMLBuilder::setLastEventTime(DWORD t) {
 }

 

 bool HTMLBuilder::isSameDate(time_t time1, time_t time2) {

-    struct tm tm_t1, tm_t2;

-    tm_t1 = *localtime((time_t *)(&time1));

-    tm_t2 = *localtime((time_t *)(&time2));

-    if (tm_t1.tm_year == tm_t2.tm_year && tm_t1.tm_mon == tm_t2.tm_mon

+	struct tm tm_t1, tm_t2;

+	tm_t1 = *localtime((time_t *)(&time1));

+	tm_t2 = *localtime((time_t *)(&time2));

+	if (tm_t1.tm_year == tm_t2.tm_year && tm_t1.tm_mon == tm_t2.tm_mon

 		&& tm_t1.tm_mday == tm_t2.tm_mday) {

 		return true;

 	}

@@ -212,8 +210,8 @@ void HTMLBuilder::getUINs(HANDLE hContact, char *&uinIn, char *&uinOut) {
 	CONTACTINFO ci;

 	char buf[128];

 	char *szProto;

-    hContact = getRealContact(hContact);

-    szProto = getProto(hContact);

+	hContact = getRealContact(hContact);

+	szProto = getProto(hContact);

 	ZeroMemory(&ci, sizeof(ci));

 	ci.cbSize = sizeof(ci);

 	ci.hContact = hContact;

@@ -255,7 +253,7 @@ wchar_t *HTMLBuilder::getContactName(HANDLE hContact, const char* szProto) {
 	ZeroMemory(&ci, sizeof(ci));

 	ci.cbSize = sizeof(ci);

 	ci.hContact = hContact;

-    ci.szProto = (char *)szProto;

+	ci.szProto = (char *)szProto;

 	ci.dwFlag = CNF_DISPLAY | CNF_UNICODE;

 	if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) {

 		if (ci.type == CNFT_ASCIIZ) {

@@ -263,31 +261,31 @@ wchar_t *HTMLBuilder::getContactName(HANDLE hContact, const char* szProto) {
 				if(!wcscmp((wchar_t *)ci.pszVal, TranslateW(L"'(Unknown Contact)'"))) {

 					ci.dwFlag &= ~CNF_UNICODE;

 					if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) {

-			        	szName = Utils::convertToWCS((char *)ci.pszVal);

+						szName = Utils::convertToWCS((char *)ci.pszVal);

 					}

 				} else {

-		        	szName = Utils::dupString((wchar_t *)ci.pszVal);

+					szName = Utils::dupString((wchar_t *)ci.pszVal);

 				}

 				miranda_sys_free(ci.pszVal);

 			}

 		}

 	}

-    if (szName != NULL) return szName;

+	if (szName != NULL) return szName;

 	ci.dwFlag = CNF_UNIQUEID;

 	if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM) & ci)) {

 		if (ci.type == CNFT_ASCIIZ) {

 			if (ci.pszVal) {

-        	    szName = Utils::convertToWCS((char *)ci.pszVal);

+				szName = Utils::convertToWCS((char *)ci.pszVal);

 				miranda_sys_free(ci.pszVal);

 			}

 		}

 	}

-    if (szName != NULL) return szName;

+	if (szName != NULL) return szName;

 	char *szNameStr = (char *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, 0);

 	if (szNameStr != NULL) {

-   	    return Utils::convertToWCS(szNameStr);

+		return Utils::convertToWCS(szNameStr);

 	}

-    return Utils::dupString(TranslateT("(Unknown Contact)"));

+	return Utils::dupString(TranslateT("(Unknown Contact)"));

 }

 

 char *HTMLBuilder::getEncodedContactName(HANDLE hContact, const char* szProto, const char* szSmileyProto) {

@@ -298,7 +296,7 @@ char *HTMLBuilder::getEncodedContactName(HANDLE hContact, const char* szProto, c
 		delete name;

 		return szName;

 	}

-    return encodeUTF8(hContact, szSmileyProto, TranslateT("(Unknown Contact)"), ENF_NAMESMILEYS, true);

+	return encodeUTF8(hContact, szSmileyProto, TranslateT("(Unknown Contact)"), ENF_NAMESMILEYS, true);

 }

 

 void HTMLBuilder::appendEventNew(IEView *view, IEVIEWEVENT *event) {

@@ -323,7 +321,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) {
 		szProto = Utils::dupString(event->pszProto);

 	} else {

 		szProto = getProto(event->hContact);

- 	}

+	}

 	newEvent.pszProto = szProto;

 	newEvent.count = 0;

 	newEvent.dwFlags = event->dwFlags;

@@ -347,9 +345,9 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) {
 			CallService(MS_DB_EVENT_MARKREAD, (WPARAM) event->hContact, (LPARAM) hDbEvent);

 		}

 		if (!isDbEventShown(&dbei)) {

-		    free(dbei.pBlob);

-	   		hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) hDbEvent, 0);

-		    continue;

+			free(dbei.pBlob);

+			hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) hDbEvent, 0);

+			continue;

 		}

 		eventData = new IEVIEWEVENTDATA;

 		eventData->cbSize = sizeof(IEVIEWEVENTDATA);

@@ -395,7 +393,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) {
 			}

 			eventData->iType = IEED_EVENT_FILE;

 		} else if (dbei.eventType == EVENTTYPE_AUTHREQUEST) {

-		    //blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)

+			//blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ)

 			eventData->ptszText = Utils::dupString(TranslateT(" requested authorisation"));

 			TCHAR *tStr = DbGetEventStringT(&dbei, (char *)dbei.pBlob + 8);

 			eventData->ptszNick = Utils::dupString(tStr);

@@ -419,7 +417,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) {
 		prevEventData = eventData;

 		newEvent.count++;

 		event->hDbEventFirst = hDbEvent;

-   		hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) hDbEvent, 0);

+		hDbEvent = (HANDLE) CallService(MS_DB_EVENT_FINDNEXT, (WPARAM) hDbEvent, 0);

 	}

 	appendEventNew(view, &newEvent);

 	for ( IEVIEWEVENTDATA* eventData2 = newEvent.eventData; eventData2 != NULL; eventData2 = eventData) {

@@ -451,7 +449,7 @@ ProtocolSettings* HTMLBuilder::getSRMMProtocolSettings(const char *protocolName)
 ProtocolSettings* HTMLBuilder::getSRMMProtocolSettings(HANDLE hContact) {

 	char *szRealProto = getRealProto(hContact);

 	ProtocolSettings *protoSettings =  getSRMMProtocolSettings(szRealProto);

-    delete szRealProto;

+	delete szRealProto;

 	return protoSettings;

 }

 

@@ -486,7 +484,7 @@ ProtocolSettings* HTMLBuilder::getChatProtocolSettings(const char *protocolName)
 ProtocolSettings* HTMLBuilder::getChatProtocolSettings(HANDLE hContact) {

 	char *szRealProto = getRealProto(hContact);

 	ProtocolSettings *protoSettings =  getChatProtocolSettings(szRealProto);

-    delete szRealProto;

+	delete szRealProto;

 	return protoSettings;

 }

 

@@ -509,7 +507,7 @@ void HTMLBuilder::setLastIEViewEvent(IEVIEWEVENT *event) {
 		lastIEViewEvent.pszProto = Utils::dupString(event->pszProto);

 	} else {

 		lastIEViewEvent.pszProto = getProto(event->hContact);

- 	}

+	}

 }

 

 void HTMLBuilder::clear(IEView *view, IEVIEWEVENT *event) {

diff --git a/IEView/HTMLBuilder.h b/IEView/HTMLBuilder.h
index 2e4fe3b..9650d60 100644
--- a/IEView/HTMLBuilder.h
+++ b/IEView/HTMLBuilder.h
@@ -41,15 +41,15 @@ private:
 protected:

 	DWORD lastEventTime;

 	int iLastEventType;

-    enum ENCODEFLAGS {

-        ENF_NONE = 0,

-        ENF_SMILEYS = 1,

-        ENF_NAMESMILEYS = 2,

-        ENF_BBCODES = 4,

-        ENF_LINKS = 8,

-        ENF_ALL = 255,

-        ENF_CHAT_FORMATTING = 256

-    };

+	enum ENCODEFLAGS {

+		ENF_NONE = 0,

+		ENF_SMILEYS = 1,

+		ENF_NAMESMILEYS = 2,

+		ENF_BBCODES = 4,

+		ENF_LINKS = 8,

+		ENF_ALL = 255,

+		ENF_CHAT_FORMATTING = 256

+	};

 //	virtual char *encode(const char *text, const char *proto, bool replaceSmiley);

 	virtual char *encodeUTF8(HANDLE hContact, const char *proto, const wchar_t *text, int flags, bool isSent);

 	virtual char *encodeUTF8(HANDLE hContact, const char *proto, const char *text, int flags, bool isSent);

diff --git a/IEView/HistoryHTMLBuilder.cpp b/IEView/HistoryHTMLBuilder.cpp
index 6c3de65..3bce0d8 100644
--- a/IEView/HistoryHTMLBuilder.cpp
+++ b/IEView/HistoryHTMLBuilder.cpp
@@ -72,69 +72,69 @@ HistoryHTMLBuilder::HistoryHTMLBuilder() {
 

 bool HistoryHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)

 {

-    switch (dbei->eventType) {

-        case EVENTTYPE_MESSAGE:

-            return 1;

-        case EVENTTYPE_STATUSCHANGE:

-            return 1;

-    }

-    return 1;

+	switch (dbei->eventType) {

+		case EVENTTYPE_MESSAGE:

+			return 1;

+		case EVENTTYPE_STATUSCHANGE:

+			return 1;

+	}

+	return 1;

 }

 

 char *HistoryHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) {

-    static char szResult[512];

-    char str[80];

-    DBTIMETOSTRING dbtts;

-    dbtts.cbDest = 70;;

-    dbtts.szDest = str;

-    szResult[0] = '\0';

-    dbtts.szFormat = (char *)"d t";

+	static char szResult[512];

+	char str[80];

+	DBTIMETOSTRING dbtts;

+	dbtts.cbDest = 70;;

+	dbtts.szDest = str;

+	szResult[0] = '\0';

+	dbtts.szFormat = (char *)"d t";

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

-    strncat(szResult, str, 500);

+	strncat(szResult, str, 500);

 	Utils::UTF8Encode(szResult, szResult, 500);

-    return szResult;

+	return szResult;

 }

 

 void HistoryHTMLBuilder::loadMsgDlgFont(const char *dbSetting, LOGFONTA * lf, COLORREF * colour, COLORREF * bkgColour) {

-    char str[128];

-    int style;

-    DBVARIANT dbv;

-    if (bkgColour) {

-        wsprintfA(str, "Back.%s", dbSetting);

-        *bkgColour = DBGetContactSettingDword(NULL, HPPMOD, str, 0xFFFFFF);

-    }

-    if (colour) {

-        wsprintfA(str, "Font.%s.Color", dbSetting);

-        *colour = DBGetContactSettingDword(NULL, HPPMOD, str, 0x000000);

-    }

-    if (lf) {

-        wsprintfA(str, "Font.%s.Size", dbSetting);

-        lf->lfHeight = (char) DBGetContactSettingByte(NULL, HPPMOD, str, 10);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "Font.%s.Style.Bold", dbSetting);

-        style = DBGetContactSettingByte(NULL, HPPMOD, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        wsprintfA(str, "Font.%s.Style.Italic", dbSetting);

-        style = DBGetContactSettingByte(NULL, HPPMOD, str, 0) << 1;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "Font.%s.Charset", dbSetting);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, HPPMOD, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "Font.%s.Name", dbSetting);

-        if (DBGetContactSetting(NULL, HPPMOD, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[128];

+	int style;

+	DBVARIANT dbv;

+	if (bkgColour) {

+		wsprintfA(str, "Back.%s", dbSetting);

+		*bkgColour = DBGetContactSettingDword(NULL, HPPMOD, str, 0xFFFFFF);

+	}

+	if (colour) {

+		wsprintfA(str, "Font.%s.Color", dbSetting);

+		*colour = DBGetContactSettingDword(NULL, HPPMOD, str, 0x000000);

+	}

+	if (lf) {

+		wsprintfA(str, "Font.%s.Size", dbSetting);

+		lf->lfHeight = (char) DBGetContactSettingByte(NULL, HPPMOD, str, 10);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "Font.%s.Style.Bold", dbSetting);

+		style = DBGetContactSettingByte(NULL, HPPMOD, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		wsprintfA(str, "Font.%s.Style.Italic", dbSetting);

+		style = DBGetContactSettingByte(NULL, HPPMOD, str, 0) << 1;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "Font.%s.Charset", dbSetting);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, HPPMOD, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "Font.%s.Name", dbSetting);

+		if (DBGetContactSetting(NULL, HPPMOD, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 const char *HistoryHTMLBuilder::getTemplateFilename(ProtocolSettings * protoSettings) {

@@ -160,20 +160,20 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		return;

 	}

  	if (protoSettings->getHistoryMode() == Options::MODE_CSS) {

-	 	const char *externalCSS = protoSettings->getHistoryCssFilename();

-        Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

+		const char *externalCSS = protoSettings->getHistoryCssFilename();

+		Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

 	} else {

 		Utils::appendText(&output, &outputSize, "<html><head>");

 		Utils::appendText(&output, &outputSize, "<style type=\"text/css\">\n");

 		COLORREF lineColor = DBGetContactSettingDword(NULL, HPPMOD, "LineColour", 0xFFFFFF);

-	    lineColor= 0;//(((lineColor & 0xFF) << 16) | (lineColor & 0xFF00) | ((lineColor & 0xFF0000) >> 16));

+		lineColor= 0;//(((lineColor & 0xFF) << 16) | (lineColor & 0xFF00) | ((lineColor & 0xFF0000) >> 16));

 		bkgColor = 0xFFFFFF;

 		if (protoSettings->getHistoryFlags() & Options::LOG_IMAGE_ENABLED) {

 			Utils::appendText(&output, &outputSize, ".body {padding: 2px; text-align: left; background-attachment: %s; background-color: #%06X;  background-image: url('%s'); overflow: auto;}\n",

 			protoSettings->getHistoryFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getHistoryBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+						(int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {float: left; vertical-align: middle;}\n");

@@ -200,7 +200,7 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 					lf.lfItalic ? "font-style: italic;" : "");

 			}

 		}

-	 	for(i = 0; i < SPAN_FONT_NUM; i++) {

+		for(i = 0; i < SPAN_FONT_NUM; i++) {

 			loadMsgDlgFont(dbSpanSettingNames[i], &lf, &color, NULL);

 			Utils::appendText(&output, &outputSize, "%s {float: %s; font-family: %s; font-size: %dpt; font-weight: %s; color: #%06X; %s }\n",

 			spanClassNames[i],

@@ -214,7 +214,7 @@ void HistoryHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 	setLastEventType(-1);

@@ -237,13 +237,13 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			char *szText = NULL;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK) {

 				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);

-   			} else {

-                szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true);

+			} else {

+				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true);

 			}

 			if (eventData->dwFlags & IEEDF_UNICODE_TEXT) {

 				szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

-   			} else {

-                szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

+			} else {

+				szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

 			}

 			/* History++-specific formatting */

 			const char *className = NULL;

@@ -269,36 +269,36 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			} else {

 				Utils::appendText(&output, &outputSize, " ");

 			}

-           	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s:</span>", isSent ? "nameOut" : "nameIn", szName);

-           	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span><br>", isSent ? "timeOut" : "timeIn", timestampToString(dwFlags, eventData->time));

+			Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s:</span>", isSent ? "nameOut" : "nameIn", szName);

+			Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span><br>", isSent ? "timeOut" : "timeIn", timestampToString(dwFlags, eventData->time));

 			if (eventData->iType == IEED_EVENT_FILE) {

 				Utils::appendText(&output, &outputSize, "%s:<br> %s", isSent ? Translate("Outgoing File Transfer") : Translate("Incoming File Transfer"), szText);

 			} else if (eventData->iType == IEED_EVENT_URL) {

-            	Utils::appendText(&output, &outputSize, "%s:<br> %s", isSent ? Translate("URL sent") : Translate("URL received"), szText);

+				Utils::appendText(&output, &outputSize, "%s:<br> %s", isSent ? Translate("URL sent") : Translate("URL received"), szText);

 			} else {

-            	Utils::appendText(&output, &outputSize, "%s", szText);

+				Utils::appendText(&output, &outputSize, "%s", szText);

 			}

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

 			setLastEventTime(eventData->time);

 			if (szName!=NULL) delete szName;

 			if (szText!=NULL) delete szText;

 		}

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

-    }

-    if (szRealProto!=NULL) delete szRealProto;

-    view->documentClose();

+	}

+	if (szRealProto!=NULL) delete szRealProto;

+	view->documentClose();

 }

 

 void HistoryHTMLBuilder::appendEvent(IEView *view, IEVIEWEVENT *event) {

-    ProtocolSettings *protoSettings = getHistoryProtocolSettings(event->hContact);

+	ProtocolSettings *protoSettings = getHistoryProtocolSettings(event->hContact);

 	if (protoSettings == NULL) {

 		return;

 	}

-    if (protoSettings->getHistoryMode() & Options::MODE_TEMPLATE) {

+	if (protoSettings->getHistoryMode() & Options::MODE_TEMPLATE) {

 		appendEventTemplate(view, event, protoSettings);

 	} else{

 		appendEventNonTemplate(view, event);

diff --git a/IEView/HistoryHTMLBuilder.h b/IEView/HistoryHTMLBuilder.h
index 667e0a9..d5806e4 100644
--- a/IEView/HistoryHTMLBuilder.h
+++ b/IEView/HistoryHTMLBuilder.h
@@ -28,7 +28,7 @@ class HistoryHTMLBuilder;
 class HistoryHTMLBuilder:public TemplateHTMLBuilder

 {

 protected:

-    void loadMsgDlgFont(const char *, LOGFONTA * lf, COLORREF * colour, COLORREF * bkgColour);

+	void loadMsgDlgFont(const char *, LOGFONTA * lf, COLORREF * colour, COLORREF * bkgColour);

 	char *timestampToString(DWORD dwFlags, time_t check);

 	DWORD startedTime;

 	bool isDbEventShown(DBEVENTINFO * dbei);

@@ -37,7 +37,7 @@ protected:
 	const char *getTemplateFilenameRtl(ProtocolSettings *);

 	int getFlags(ProtocolSettings *);

 public:

-    HistoryHTMLBuilder();

+	HistoryHTMLBuilder();

 	void buildHead(IEView *, IEVIEWEVENT *event);

 	void appendEvent(IEView *, IEVIEWEVENT *event);

 };

diff --git a/IEView/IEView.cpp b/IEView/IEView.cpp
index 9bc4308..78b4645 100644
--- a/IEView/IEView.cpp
+++ b/IEView/IEView.cpp
@@ -40,7 +40,7 @@ struct MM_INTERFACE   mmi;
 

 

 static LRESULT CALLBACK IEViewServerWindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {

-    IEView *view = IEView::get(GetParent(GetParent(hwnd)));

+	IEView *view = IEView::get(GetParent(GetParent(hwnd)));

 	if (view != NULL) {

 		switch (message) {

 		case WM_KEYUP:

@@ -55,7 +55,7 @@ static LRESULT CALLBACK IEViewServerWindowProcedure (HWND hwnd, UINT message, WP
 			break;

 		case WM_KEYDOWN:

 			view->translateAccelerator(message, wParam, lParam);

-		   	break;

+			break;

 		case WM_SETFOCUS:

 			{

 				RECT rcWindow;

@@ -73,43 +73,43 @@ static LRESULT CALLBACK IEViewServerWindowProcedure (HWND hwnd, UINT message, WP
 			}

 			break;

 		case WM_LBUTTONDOWN:

-		    POINT pt;

-		    pt.x = LOWORD(lParam);

-		    pt.y = HIWORD(lParam);

-	   		if (view->mouseClick(pt)) {

-	   		    return TRUE;

-       		}

-		    break;

+			POINT pt;

+			pt.x = LOWORD(lParam);

+			pt.y = HIWORD(lParam);

+			if (view->mouseClick(pt)) {

+				return TRUE;

+			}

+			break;

 		}

 		return CallWindowProc(view->getServerWndProc(), hwnd, message, wParam, lParam);

-    }

-    return DefWindowProc (hwnd, message, wParam, lParam);

+	}

+	return DefWindowProc (hwnd, message, wParam, lParam);

 }

 

 static LRESULT CALLBACK IEViewDocWindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {

-   	IEView *view = IEView::get(GetParent(hwnd));

-   	if (view!=NULL) {

+	IEView *view = IEView::get(GetParent(hwnd));

+	if (view!=NULL) {

 		WNDPROC oldWndProc = view->getDocWndProc();

-    	if (message == WM_PARENTNOTIFY && wParam == WM_CREATE) {

+		if (message == WM_PARENTNOTIFY && wParam == WM_CREATE) {

 			SetWindowLong(hwnd, GWLP_WNDPROC, (LONG_PTR) oldWndProc);

 			view->setServerWndProc((WNDPROC) SetWindowLong((HWND)lParam, GWLP_WNDPROC, (LONG_PTR) IEViewServerWindowProcedure));

 		}

 		return CallWindowProc(oldWndProc, hwnd, message, wParam, lParam);

-    }

-    return DefWindowProc (hwnd, message, wParam, lParam);

+	}

+	return DefWindowProc (hwnd, message, wParam, lParam);

 }

 

 static LRESULT CALLBACK IEViewWindowProcedure (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) {

-   	IEView *view = IEView::get(hwnd);

-   	if (view!=NULL) {

+	IEView *view = IEView::get(hwnd);

+	if (view!=NULL) {

 		WNDPROC oldWndProc = view->getMainWndProc();

-    	if (message == WM_PARENTNOTIFY && wParam == WM_CREATE) {

+		if (message == WM_PARENTNOTIFY && wParam == WM_CREATE) {

 			SetWindowLong(hwnd, GWLP_WNDPROC, (LONG_PTR) oldWndProc);

 			view->setDocWndProc((WNDPROC) SetWindowLong((HWND)lParam, GWLP_WNDPROC, (LONG_PTR) IEViewDocWindowProcedure));

 		}

 		return CallWindowProc(oldWndProc, hwnd, message, wParam, lParam);

-    }

-    return DefWindowProc (hwnd, message, wParam, lParam);

+	}

+	return DefWindowProc (hwnd, message, wParam, lParam);

 }

 

 IEViewSink::IEViewSink(IEView *smptr) {

@@ -155,14 +155,14 @@ STDMETHODIMP IEViewSink::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid , WO
 	if (!pDispParams) return E_INVALIDARG;

  	switch (dispIdMember) {

 		case DISPID_BEFORENAVIGATE2:

-            BeforeNavigate2(pDispParams->rgvarg[6].pdispVal,

+			BeforeNavigate2(pDispParams->rgvarg[6].pdispVal,

 							pDispParams->rgvarg[5].pvarVal,

 							pDispParams->rgvarg[4].pvarVal,

-            				pDispParams->rgvarg[3].pvarVal,

-            				pDispParams->rgvarg[2].pvarVal,

-            				pDispParams->rgvarg[1].pvarVal,

-            				pDispParams->rgvarg[0].pboolVal);

-	    	return S_OK;

+							pDispParams->rgvarg[3].pvarVal,

+							pDispParams->rgvarg[2].pvarVal,

+							pDispParams->rgvarg[1].pvarVal,

+							pDispParams->rgvarg[0].pboolVal);

+			return S_OK;

 	}

 	return DISP_E_MEMBERNOTFOUND;

 }

@@ -177,20 +177,20 @@ void IEViewSink::TitleChange(BSTR text) {}
 void IEViewSink::PropertyChange(BSTR text) {}

 void IEViewSink::BeforeNavigate2(IDispatch* pDisp,VARIANT* url,VARIANT* flags, VARIANT* targetFrameName,

 								VARIANT* postData, VARIANT* headers, VARIANT_BOOL* cancel) {

-   	int i = (int)wcslen(url->bstrVal);

-   	char *tTemp = new char[i+1];

-   	WideCharToMultiByte(CP_ACP, 0, url->bstrVal, -1, tTemp, i+1, NULL, NULL);

+	int i = (int)wcslen(url->bstrVal);

+	char *tTemp = new char[i+1];

+	WideCharToMultiByte(CP_ACP, 0, url->bstrVal, -1, tTemp, i+1, NULL, NULL);

 #ifndef GECKO

 	if (strcmp(tTemp, "about:blank")) {

 //		if (smileyWindow==NULL) {

-      		CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) tTemp);

-  // 		} else {

+			CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) tTemp);

+//		} else {

 	//		smileyWindow->choose(tTemp);

 	//	}

-    	*cancel = VARIANT_TRUE;

+		*cancel = VARIANT_TRUE;

 	}

 #endif

-   	delete tTemp;

+	delete tTemp;

 }

 

 void IEViewSink::NewWindow2(IDispatch** ppDisp, VARIANT_BOOL* cancel) {}

@@ -253,8 +253,8 @@ void IEView::setBorder() {
 IEView::IEView(HWND parent, HTMLBuilder* builder, int x, int y, int cx, int cy) {

 	MSG msg;

 	IOleObject*   pOleObject = NULL;

-    IOleInPlaceObject *pOleInPlace;

-    isContactSet = false;

+	IOleInPlaceObject *pOleInPlace;

+	isContactSet = false;

 	this->parent = parent;

 	this->builder = builder;

 	prev = next = NULL;

@@ -276,48 +276,48 @@ IEView::IEView(HWND parent, HTMLBuilder* builder, int x, int y, int cx, int cy)
 #endif

 //		pWebBrowser->put_RegisterAsBrowser(VARIANT_FALSE);

 		if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleObject, (void**)&pOleObject))) {

-    		pOleObject->SetClientSite(this);

-    		pOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, &msg, this, 0, this->parent, &rcClient);

-    		pOleObject->Release();

-   		} else {

-  			MessageBoxA(NULL,"IID_IOleObject failed.","RESULT",MB_OK);

-   		}

+			pOleObject->SetClientSite(this);

+			pOleObject->DoVerb(OLEIVERB_INPLACEACTIVATE, &msg, this, 0, this->parent, &rcClient);

+			pOleObject->Release();

+		} else {

+			MessageBoxA(NULL,"IID_IOleObject failed.","RESULT",MB_OK);

+		}

 

 		if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleInPlaceObject, (void**)&pOleInPlace))) {

-    		pOleInPlace->GetWindow(&hwnd);

-    		pOleInPlace->Release();

+			pOleInPlace->GetWindow(&hwnd);

+			pOleInPlace->Release();

 		} else {

-  			MessageBoxA(NULL,"IID_IOleInPlaceObject failed.","RESULT",MB_OK);

+			MessageBoxA(NULL,"IID_IOleInPlaceObject failed.","RESULT",MB_OK);

 		}

 

 		setBorder();

-   		IConnectionPointContainer* pCPContainer;

-	   // Step 1: Get a pointer to the connection point container.

-   		if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IConnectionPointContainer,

-                                      		(void**)&pCPContainer))) {

-	      // m_pConnectionPoint is defined like this:

-	      // Step 2: Find the connection point.

-      		if (SUCCEEDED(pCPContainer->FindConnectionPoint(DIID_DWebBrowserEvents2,

-	                                             &m_pConnectionPoint))) {

-	         // Step 3: Advise the connection point that you

-	         // want to sink its events.

-	            sink = new IEViewSink(this);

-	         	if (FAILED(m_pConnectionPoint->Advise((IUnknown *)sink, &m_dwCookie)))     {

-	            	MessageBoxA(NULL, "Failed to Advise", "C++ Event Sink", MB_OK);

-	         	}

-	      	}

-      		pCPContainer->Release();

-   		}

+		IConnectionPointContainer* pCPContainer;

+		// Step 1: Get a pointer to the connection point container.

+		if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IConnectionPointContainer,

+											(void**)&pCPContainer))) {

+		// m_pConnectionPoint is defined like this:

+		// Step 2: Find the connection point.

+			if (SUCCEEDED(pCPContainer->FindConnectionPoint(DIID_DWebBrowserEvents2,

+												 &m_pConnectionPoint))) {

+			 // Step 3: Advise the connection point that you

+			 // want to sink its events.

+				sink = new IEViewSink(this);

+			 	if (FAILED(m_pConnectionPoint->Advise((IUnknown *)sink, &m_dwCookie)))	 {

+					MessageBoxA(NULL, "Failed to Advise", "C++ Event Sink", MB_OK);

+			 	}

+			}

+			pCPContainer->Release();

+		}

 #ifndef GECKO

 		setMainWndProc((WNDPROC)SetWindowLong(hwnd, GWLP_WNDPROC, (LONG_PTR) IEViewWindowProcedure));

 #else

 //		setMainWndProc((WNDPROC)SetWindowLong(hwnd, GWLP_WNDPROC, (LONG_PTR) MozillaWindowProcedure));

 #endif

-    }

-    EnterCriticalSection(&mutex);

+	}

+	EnterCriticalSection(&mutex);

 	next = list;

 	if (next != NULL) {

-	    next->prev = this;

+		next->prev = this;

 	}

 	list = this;

 	LeaveCriticalSection(&mutex);

@@ -350,8 +350,8 @@ IEView::~IEView() {
 		builder = NULL;

 	}

 	if (m_pConnectionPoint != NULL) {

-        m_pConnectionPoint->Unadvise(m_dwCookie);

-        m_pConnectionPoint->Release();

+		m_pConnectionPoint->Unadvise(m_dwCookie);

+		m_pConnectionPoint->Release();

 	}

 	if (sink != NULL) {

 		delete sink;

@@ -377,7 +377,7 @@ void IEView::init() {
 void IEView::release() {

 	EnterCriticalSection(&mutex);

 	while (list != NULL) {

-	    delete list;

+		delete list;

 	}

 	LeaveCriticalSection(&mutex);

 	DeleteCriticalSection(&mutex);

@@ -469,7 +469,7 @@ STDMETHODIMP IEView::Invoke(DISPID dispIdMember, REFIID riid, LCID lcid , WORD w
 

 // IOleWindow

 STDMETHODIMP IEView::GetWindow(HWND *phwnd) {

-   *phwnd = parent;

+	*phwnd = parent;

 	return S_OK;

 }

 

@@ -479,7 +479,7 @@ STDMETHODIMP IEView::ContextSensitiveHelp(BOOL fEnterMode) {
 

 // IOleInPlace

 STDMETHODIMP IEView::CanInPlaceActivate(void) {

-   return S_OK;

+	return S_OK;

 }

 

 STDMETHODIMP IEView::OnInPlaceActivate(void) {

@@ -493,7 +493,7 @@ STDMETHODIMP IEView::OnUIActivate(void) {
 

 STDMETHODIMP IEView::GetWindowContext(IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc,

 							LPRECT lprcPosRect, LPRECT lprcClipRect,

-						   LPOLEINPLACEFRAMEINFO lpFrameInfo) {

+							LPOLEINPLACEFRAMEINFO lpFrameInfo) {

 

 	lprcPosRect->left = rcClient.left;

 	lprcPosRect->top = rcClient.top;

@@ -553,10 +553,10 @@ STDMETHODIMP IEView::RequestNewObjectLayout(void) {
 // IDocHostUIHandler

 STDMETHODIMP IEView::ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdTarget, IDispatch *pdispReserved) {

 	IOleCommandTarget * pOleCommandTarget;

-    IOleWindow * pOleWindow;

+	IOleWindow * pOleWindow;

 	HWND hSPWnd;

 	if (builder == NULL) {

-   //     return S_OK;

+	//	return S_OK;

 	}

 #ifdef GECKO

 	{

@@ -576,12 +576,12 @@ STDMETHODIMP IEView::ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdTarge
 

 		}

 		int iSelection = TrackPopupMenu(hMenu,

-										  TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,

-										  ppt->x,

-										  ppt->y,

-										  0,

-										  hwnd,

-										  (RECT*)NULL);

+										TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,

+										ppt->x,

+										ppt->y,

+										0,

+										hwnd,

+										(RECT*)NULL);

 		DestroyMenu(hMenu);

 		if (iSelection == ID_MENU_CLEARLOG) {

 			clear(NULL);

@@ -608,12 +608,12 @@ STDMETHODIMP IEView::ShowContextMenu(DWORD dwID, POINT *ppt, IUnknown *pcmdTarge
 

 			}

 		 	int iSelection = TrackPopupMenu(hMenu,

-		                                      TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,

-		                                      ppt->x,

-		                                      ppt->y,

-		                                      0,

-		                                      hwnd,

-		                                      (RECT*)NULL);

+											TPM_LEFTALIGN | TPM_RIGHTBUTTON | TPM_RETURNCMD,

+											ppt->x,

+											ppt->y,

+											0,

+											hwnd,

+											(RECT*)NULL);

 			DestroyMenu(hMenu);

 			if (iSelection == ID_MENU_CLEARLOG) {

 				clear(NULL);

@@ -635,7 +635,7 @@ STDMETHODIMP IEView::GetHostInfo(DOCHOSTUIINFO *pInfo) {
  	return S_OK;

 }

 STDMETHODIMP IEView::ShowUI(DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget,

-		    				IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) {

+							IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc) {

  	return S_OK;

 }

 

@@ -655,7 +655,7 @@ STDMETHODIMP IEView::GetDropTarget(IDropTarget *pDropTarget, IDropTarget **ppDro
 

 STDMETHODIMP IEView::GetExternal(IDispatch **ppDispatch) {

 	*ppDispatch = NULL;

-    return S_FALSE;

+	return S_FALSE;

 }

 STDMETHODIMP IEView::TranslateUrl(DWORD dwTranslate, OLECHAR *pchURLIn, OLECHAR **ppchURLOut) { return E_NOTIMPL; }

 STDMETHODIMP IEView::FilterDataObject(IDataObject *pDO, IDataObject **ppDORet) { return E_NOTIMPL; }

@@ -684,7 +684,7 @@ STDMETHODIMP IEView::GetSecuritySite(IInternetSecurityMgrSite **ppSite) {
 STDMETHODIMP IEView::MapUrlToZone(LPCWSTR pwszUrl, DWORD *pdwZone, DWORD dwFlags) {

 	if (pdwZone!=NULL && pwszUrl!=NULL && !wcscmp(pwszUrl, L"about:blank")) {

 		*pdwZone = URLZONE_LOCAL_MACHINE;

-        return S_OK;

+		return S_OK;

 	}

 	return INET_E_DEFAULT_ACTION;

 }

@@ -760,13 +760,13 @@ void IEView::setWindowPos(int x, int y, int cx, int cy) {
 	}

 	SetWindowPos(getHWND(), HWND_TOP, x, y, cx, cy, 0);

 	/*

-    IOleInPlaceObject * inPlaceObject;

-   	if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleInPlaceObject, (void **)&inPlaceObject))) {

-   		inPlaceObject->SetObjectRects(&rcClient, &rcClient);

-   		inPlaceObject->Release();

+	IOleInPlaceObject * inPlaceObject;

+	if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleInPlaceObject, (void **)&inPlaceObject))) {

+		inPlaceObject->SetObjectRects(&rcClient, &rcClient);

+		inPlaceObject->Release();

 	}

- 	*/

- 	if (builder == NULL) {

+	*/

+	if (builder == NULL) {

 		//scrollToTop();

 	} else {

 //		scrollToBottomSoft();

@@ -802,15 +802,15 @@ void IEView::scrollToBottom() {/*
 	if (document != NULL) {

 		wchar_t *p = NULL;

 		if (SUCCEEDED(document->get_readyState(&p))) {

-		    int licznik = 0;

-    		do {

-          		if (FAILED(document->get_readyState(&p))) {

-          		    break;

-                }

-                licznik++;

-                if (licznik == 1) break;

-                Sleep(10);

-    		} while (!wcscmp(p, L"loading"));

+			int licznik = 0;

+			do {

+				if (FAILED(document->get_readyState(&p))) {

+					break;

+				}

+				licznik++;

+				if (licznik == 1) break;

+				Sleep(10);

+			} while (!wcscmp(p, L"loading"));

 		}

 		IHTMLWindow2* pWindow = NULL;

 		if (SUCCEEDED(document->get_parentWindow( &pWindow )) && pWindow != NULL) {

@@ -821,11 +821,11 @@ void IEView::scrollToBottom() {/*
 

 	IHTMLDocument2 *document = getDocument();

 	if (document != NULL) {

-        IHTMLElementCollection *collection;

-        IHTMLElement *element;

+		IHTMLElementCollection *collection;

+		IHTMLElement *element;

 		IDispatch *dispatch;

 		if (SUCCEEDED(document->get_all(&collection)) && (collection != NULL)) {

-            long len;

+			long len;

 			if (SUCCEEDED(collection->get_length(&len))) {

 				VARIANT	variant;

 				variant.vt = VT_I4;

@@ -942,7 +942,7 @@ void IEView::appendEvent(IEVIEWEVENT *event) {
 

 void IEView::clear(IEVIEWEVENT *event) {

 #ifdef GECKO

-    pWebBrowser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);

+	pWebBrowser->Navigate(L"about:blank", NULL, NULL, NULL, NULL);

 	Utils::forkThread((void (__cdecl *)(void *))StartThread, 0, (void *) this);

 	MSG msg;

 	BOOL bRet;

@@ -992,7 +992,7 @@ void IEView::clear(IEVIEWEVENT *event) {
 		getFocus = false;

 

 	}

-    return;

+	return;

 #endif

 	IHTMLDocument2 *document = getDocument();

 	if (document == NULL) {

@@ -1023,10 +1023,10 @@ void IEView::clear(IEVIEWEVENT *event) {
 		VariantInit(&open_replace);

 

 		HRESULT hr = document->open(SysAllocString(L"text/html"),

-		                    open_name,

-			                    open_features,

-			                    open_replace,

-			                    &open_window);

+							open_name,

+								open_features,

+								open_replace,

+								&open_window);

 		if (hr == S_OK) {

 		//	pWebBrowser->Refresh();

 		}

@@ -1071,14 +1071,14 @@ void IEView::setContact(HANDLE hContact) {
 }

 

 void IEView::translateAccelerator(UINT uMsg, WPARAM wParam, LPARAM lParam) {

-    IOleInPlaceActiveObject* pIOIPAO;

-    if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleInPlaceActiveObject, (void**)&pIOIPAO))) {

-       MSG msg;

-       msg.message = uMsg;

-       msg.wParam = wParam;

-       msg.lParam = lParam;

-       pIOIPAO->TranslateAccelerator(&msg);

-       pIOIPAO->Release();

+	IOleInPlaceActiveObject* pIOIPAO;

+	if (SUCCEEDED(pWebBrowser->QueryInterface(IID_IOleInPlaceActiveObject, (void**)&pIOIPAO))) {

+		MSG msg;

+		msg.message = uMsg;

+		msg.wParam = wParam;

+		msg.lParam = lParam;

+		pIOIPAO->TranslateAccelerator(&msg);

+		pIOIPAO->Release();

 	}

 }

 

@@ -1089,12 +1089,12 @@ BSTR IEView::getSelection() {
 	BSTR text = NULL;

 	IHTMLDocument2 *document = getDocument();

 	if (document != NULL) {

-        IHTMLSelectionObject *pSelection = NULL;

+		IHTMLSelectionObject *pSelection = NULL;

 		if (SUCCEEDED(document->get_selection( &pSelection )) && pSelection != NULL) {

 			IDispatch *pDisp = NULL;

 			if (SUCCEEDED(pSelection->createRange( &pDisp )) &&  pDisp != NULL) {

-                IHTMLTxtRange *pRange = NULL;

-			    if (SUCCEEDED(pDisp->QueryInterface(IID_IHTMLTxtRange, (void**)&pRange))) {

+				IHTMLTxtRange *pRange = NULL;

+				if (SUCCEEDED(pDisp->QueryInterface(IID_IHTMLTxtRange, (void**)&pRange))) {

 					if (SUCCEEDED(pRange->get_text(&text))) {

 						text = Utils::dupString(text);

 					}

@@ -1114,74 +1114,74 @@ BSTR IEView::getSelection() {
  * Returns the destination url (href) of the given anchor element (or parent anchor element)

  **/

 BSTR IEView::getHrefFromAnchor(IHTMLElement *element) {

-    if (element != NULL) {

-    	IHTMLAnchorElement * pAnchor;

-        if (SUCCEEDED(element->QueryInterface(IID_IHTMLAnchorElement, (void**)&pAnchor)) && (pAnchor!=NULL)) {

+	if (element != NULL) {

+		IHTMLAnchorElement * pAnchor;

+		if (SUCCEEDED(element->QueryInterface(IID_IHTMLAnchorElement, (void**)&pAnchor)) && (pAnchor!=NULL)) {

 			VARIANT	variant;

-            BSTR url;

-            if (SUCCEEDED(element->getAttribute(L"href", 2, &variant) && variant.vt == VT_BSTR)) {

+			BSTR url;

+			if (SUCCEEDED(element->getAttribute(L"href", 2, &variant) && variant.vt == VT_BSTR)) {

 				url = Utils::dupString(variant.bstrVal);

 				SysFreeString(variant.bstrVal);

 			}

-            //pAnchor->get_href( &url );

-//            if (url!=NULL) {

-  //          	url2 = Utils::dupString(url);

-  //          	SysFreeString(url);

-    //        	url = url2;

-      //     	}

-            pAnchor->Release();

-            return url;

-        } else {

-            IHTMLElement * parent;

-            if (SUCCEEDED(element->get_parentElement(&parent)) && (parent!=NULL)) {

-            	BSTR url = getHrefFromAnchor(parent);

-            	parent->Release();

-            	return url;

-           	}

-        }

-    }

-    return NULL;

+			//pAnchor->get_href( &url );

+//			if (url!=NULL) {

+//			url2 = Utils::dupString(url);

+//			SysFreeString(url);

+	//			url = url2;

+	//		}

+			pAnchor->Release();

+			return url;

+		} else {

+			IHTMLElement * parent;

+			if (SUCCEEDED(element->get_parentElement(&parent)) && (parent!=NULL)) {

+				BSTR url = getHrefFromAnchor(parent);

+				parent->Release();

+				return url;

+			}

+		}

+	}

+	return NULL;

 }

 

 bool IEView::mouseActivate() {

-    if (GetFocus() != hwnd) {

+	if (GetFocus() != hwnd) {

 		getFocus = true;

 	}

 	return false;

 }

 

 bool IEView::mouseClick(POINT pt) {

-    bool result = false;

-    if (GetFocus() != hwnd) {

+	bool result = false;

+	if (GetFocus() != hwnd) {

 		getFocus = true;

 	}

 	IHTMLDocument2 *document = getDocument();

 	if (document != NULL) {

-        IHTMLElement *element;

-  		if (SUCCEEDED(document->elementFromPoint( pt.x, pt.y, &element ))&& element!=NULL) {

+		IHTMLElement *element;

+		if (SUCCEEDED(document->elementFromPoint( pt.x, pt.y, &element ))&& element!=NULL) {

 //		IHTMLAnchorElement * pAnchor;

 //			if (SUCCEEDED(element->QueryInterface(IID_IHTMLAnchorElement, (void**)&pAnchor)) && (pAnchor!=NULL)) {

 //				element->click();

 //				result = true;

 //				pAnchor->Release();

 //			}

-  			BSTR url = getHrefFromAnchor(element);

-  			if (url != NULL) {

+			BSTR url = getHrefFromAnchor(element);

+			if (url != NULL) {

 				if ((GetKeyState(VK_SHIFT) & 0x8000) && !(GetKeyState(VK_CONTROL) & 0x8000)

 				&& !(GetKeyState(VK_MENU) & 0x8000)) {

 					SendMessage(GetParent(hwnd), WM_COMMAND, IDCANCEL, 0);

 				}

-  			    int i = (int)wcslen(url);

-  			    char *tTemp = new char[i+1];

-  			    WideCharToMultiByte(CP_ACP, 0, url, -1, tTemp, i+1, NULL, NULL);

-		    	CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) tTemp);

-                delete tTemp;

-                delete url;

-                result = true;

-  			}

-  			element->Release();

-  		}

-	    document->Release();

+				int i = (int)wcslen(url);

+				char *tTemp = new char[i+1];

+				WideCharToMultiByte(CP_ACP, 0, url, -1, tTemp, i+1, NULL, NULL);

+				CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) tTemp);

+				delete tTemp;

+				delete url;

+				result = true;

+			}

+			element->Release();

+		}

+		document->Release();

 	}

 	return result;

 }

@@ -1200,13 +1200,13 @@ void IEView::saveDocument() {
 	IHTMLDocument2 *document = getDocument();

 	if (document != NULL) {

 		BSTR bCmd = SysAllocString(L"SaveAs");

-    	VARIANT_BOOL vb;

-    	VARIANT      vValue;

-    	vValue.vt = VT_BOOL;

-    	vValue.boolVal = TRUE;

-        document->execCommand(bCmd, VARIANT_FALSE, vValue, &vb);

-    	SysFreeString(bCmd);

-	    document->Release();

+		VARIANT_BOOL vb;

+		VARIANT      vValue;

+		vValue.vt = VT_BOOL;

+		vValue.boolVal = TRUE;

+		document->execCommand(bCmd, VARIANT_FALSE, vValue, &vb);

+		SysFreeString(bCmd);

+		document->Release();

 	}

 }

 

diff --git a/IEView/IEView.h b/IEView/IEView.h
index b6f93a3..156affb 100644
--- a/IEView/IEView.h
+++ b/IEView/IEView.h
@@ -29,8 +29,8 @@ class IEView;
 

 static const CLSID CLSID_MozillaBrowser=

 { 0x1339B54C, 0x3453, 0x11D2,

-    { 0x93, 0xB9, 0x00, 0x00,

-      0x00, 0x00, 0x00, 0x00 } };

+	{ 0x93, 0xB9, 0x00, 0x00,

+	  0x00, 0x00, 0x00, 0x00 } };

 

 #ifndef DISPID_AMBIENT_DLCONTROL

 #define DISPID_AMBIENT_DLCONTROL                (-5512)

@@ -39,16 +39,14 @@ static const CLSID CLSID_MozillaBrowser=
 #ifndef __IDocHostUIHandler_INTERFACE_DEFINED__

 #define __IDocHostUIHandler_INTERFACE_DEFINED__

 

-

 typedef struct _DOCHOSTUIINFO

-    {

-    ULONG cbSize;

-    DWORD dwFlags;

-    DWORD dwDoubleClick;

-    OLECHAR *pchHostCss;

-    OLECHAR *pchHostNS;

-    } 	DOCHOSTUIINFO;

-

+	{

+	ULONG cbSize;

+	DWORD dwFlags;

+	DWORD dwDoubleClick;

+	OLECHAR *pchHostCss;

+	OLECHAR *pchHostNS;

+	} DOCHOSTUIINFO;

 

 const IID IID_IDocHostUIHandler ={0xbd3f23c0,0xd43e,0x11CF,{0x89, 0x3b, 0x00, 0xaa, 0x00, 0xbd, 0xce, 0x1a}};

 

@@ -57,71 +55,71 @@ const IID IID_IDocHostUIHandler ={0xbd3f23c0,0xd43e,0x11CF,{0x89, 0x3b, 0x00, 0x
 	{

 	public:

 	virtual HRESULT STDMETHODCALLTYPE ShowContextMenu( 

-	    /* [in] */ DWORD dwID,

-	    /* [in] */ POINT *ppt,

-	    /* [in] */ IUnknown *pcmdtReserved,

-	    /* [in] */ IDispatch *pdispReserved) = 0;

+		/* [in] */ DWORD dwID,

+		/* [in] */ POINT *ppt,

+		/* [in] */ IUnknown *pcmdtReserved,

+		/* [in] */ IDispatch *pdispReserved) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE GetHostInfo( 

-	    /* [out][in] */ DOCHOSTUIINFO *pInfo) = 0;

+		/* [out][in] */ DOCHOSTUIINFO *pInfo) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE ShowUI( 

-	    /* [in] */ DWORD dwID,

-	    /* [in] */ IOleInPlaceActiveObject *pActiveObject,

-	    /* [in] */ IOleCommandTarget *pCommandTarget,

-	    /* [in] */ IOleInPlaceFrame *pFrame,

-	    /* [in] */ IOleInPlaceUIWindow *pDoc) = 0;

+		/* [in] */ DWORD dwID,

+		/* [in] */ IOleInPlaceActiveObject *pActiveObject,

+		/* [in] */ IOleCommandTarget *pCommandTarget,

+		/* [in] */ IOleInPlaceFrame *pFrame,

+		/* [in] */ IOleInPlaceUIWindow *pDoc) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE HideUI( void) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE UpdateUI( void) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE EnableModeless( 

-	    /* [in] */ BOOL fEnable) = 0;

+		/* [in] */ BOOL fEnable) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE OnDocWindowActivate( 

-	    /* [in] */ BOOL fActivate) = 0;

+		/* [in] */ BOOL fActivate) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE OnFrameWindowActivate( 

-	    /* [in] */ BOOL fActivate) = 0;

+		/* [in] */ BOOL fActivate) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE ResizeBorder( 

-	    /* [in] */ LPCRECT prcBorder,

-	    /* [in] */ IOleInPlaceUIWindow *pUIWindow,

-	    /* [in] */ BOOL fRameWindow) = 0;

+		/* [in] */ LPCRECT prcBorder,

+		/* [in] */ IOleInPlaceUIWindow *pUIWindow,

+		/* [in] */ BOOL fRameWindow) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE TranslateAccelerator( 

-	    /* [in] */ LPMSG lpMsg,

-	    /* [in] */ const GUID *pguidCmdGroup,

-	    /* [in] */ DWORD nCmdID) = 0;

+		/* [in] */ LPMSG lpMsg,

+		/* [in] */ const GUID *pguidCmdGroup,

+		/* [in] */ DWORD nCmdID) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE GetOptionKeyPath( 

-	    /* [annotation][out] */ 

-	    LPOLESTR *pchKey,

-	    /* [in] */ DWORD dw) = 0;

+		/* [annotation][out] */ 

+		LPOLESTR *pchKey,

+		/* [in] */ DWORD dw) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE GetDropTarget( 

-	    /* [in] */ IDropTarget *pDropTarget,

-	    /* [out] */ IDropTarget **ppDropTarget) = 0;

+		/* [in] */ IDropTarget *pDropTarget,

+		/* [out] */ IDropTarget **ppDropTarget) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE GetExternal( 

-	    /* [out] */ IDispatch **ppDispatch) = 0;

+		/* [out] */ IDispatch **ppDispatch) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE TranslateUrl( 

-	    /* [in] */ DWORD dwTranslate,

-	    /* [annotation][in] */ 

-	    OLECHAR *pchURLIn,

-	    /* [annotation][out] */ 

-	    OLECHAR **ppchURLOut) = 0;

+		/* [in] */ DWORD dwTranslate,

+		/* [annotation][in] */ 

+		OLECHAR *pchURLIn,

+		/* [annotation][out] */ 

+		OLECHAR **ppchURLOut) = 0;

 

 	virtual HRESULT STDMETHODCALLTYPE FilterDataObject( 

-	    /* [in] */ IDataObject *pDO,

-	    /* [out] */ IDataObject **ppDORet) = 0;

+		/* [in] */ IDataObject *pDO,

+		/* [out] */ IDataObject **ppDORet) = 0;

 

 	};

 

 typedef enum tagDOCHOSTUIFLAG

-    {	DOCHOSTUIFLAG_DIALOG	= 0x1,

+	{	DOCHOSTUIFLAG_DIALOG	= 0x1,

 	DOCHOSTUIFLAG_DISABLE_HELP_MENU	= 0x2,

 	DOCHOSTUIFLAG_NO3DBORDER	= 0x4,

 	DOCHOSTUIFLAG_SCROLL_NO	= 0x8,

@@ -151,9 +149,8 @@ typedef enum tagDOCHOSTUIFLAG
 	DOCHOSTUIFLAG_USE_WINDOWED_SELECTCONTROL	= 0x10000000,

 	DOCHOSTUIFLAG_ENABLE_ACTIVEX_INACTIVATE_MODE	= 0x20000000,

 	DOCHOSTUIFLAG_DPI_AWARE	= 0x40000000

-    } 	DOCHOSTUIFLAG;

+	} DOCHOSTUIFLAG;

 

-    

 #endif 	/* __IDocHostUIHandler_INTERFACE_DEFINED__ */

 

 #ifndef __IHTMLAnchorElement_INTERFACE_DEFINED__

@@ -165,150 +162,149 @@ typedef enum tagDOCHOSTUIFLAG
 

 EXTERN_C const IID IID_IHTMLAnchorElement;

 

-    

-    MIDL_INTERFACE("3050f1da-98b5-11cf-bb82-00aa00bdce0b")

-    IHTMLAnchorElement : public IDispatch

-    {

-    public:

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_href( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_href( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_target( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_target( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_rel( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_rel( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_rev( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_rev( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_urn( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_urn( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_Methods( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_Methods( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_name( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_name( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_host( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_host( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_hostname( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_hostname( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_pathname( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_pathname( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_port( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_port( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_protocol( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_protocol( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_search( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_search( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_hash( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_hash( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_onblur( 

-            /* [in] */ VARIANT v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_onblur( 

-            /* [out][retval] */  VARIANT *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_onfocus( 

-            /* [in] */ VARIANT v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_onfocus( 

-            /* [out][retval] */  VARIANT *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_accessKey( 

-            /* [in] */  BSTR v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_accessKey( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_protocolLong( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_mimeType( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_nameProp( 

-            /* [out][retval] */  BSTR *p) = 0;

-        

-        virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_tabIndex( 

-            /* [in] */ short v) = 0;

-        

-        virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_tabIndex( 

-            /* [out][retval] */  short *p) = 0;

-        

-        virtual /* [id] */ HRESULT STDMETHODCALLTYPE focus( void) = 0;

-        

-        virtual /* [id] */ HRESULT STDMETHODCALLTYPE blur( void) = 0;

-        

-    };

-    

+	MIDL_INTERFACE("3050f1da-98b5-11cf-bb82-00aa00bdce0b")

+	IHTMLAnchorElement : public IDispatch

+	{

+	public:

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_href( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_href( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_target( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_target( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_rel( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_rel( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_rev( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_rev( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_urn( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_urn( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_Methods( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_Methods( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_name( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_name( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_host( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_host( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_hostname( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_hostname( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_pathname( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_pathname( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_port( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_port( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_protocol( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_protocol( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_search( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_search( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propput] */ HRESULT STDMETHODCALLTYPE put_hash( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_hash( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_onblur( 

+			/* [in] */ VARIANT v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_onblur( 

+			/* [out][retval] */  VARIANT *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_onfocus( 

+			/* [in] */ VARIANT v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_onfocus( 

+			/* [out][retval] */  VARIANT *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_accessKey( 

+			/* [in] */  BSTR v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_accessKey( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_protocolLong( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_mimeType( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [id][propget] */ HRESULT STDMETHODCALLTYPE get_nameProp( 

+			/* [out][retval] */  BSTR *p) = 0;

+

+		virtual /* [bindable][displaybind][id][propput] */ HRESULT STDMETHODCALLTYPE put_tabIndex( 

+			/* [in] */ short v) = 0;

+

+		virtual /* [bindable][displaybind][id][propget] */ HRESULT STDMETHODCALLTYPE get_tabIndex( 

+			/* [out][retval] */  short *p) = 0;

+

+		virtual /* [id] */ HRESULT STDMETHODCALLTYPE focus( void) = 0;

+

+		virtual /* [id] */ HRESULT STDMETHODCALLTYPE blur( void) = 0;

+

+	};

+

 #endif 	/* __IHTMLAnchorElement_INTERFACE_DEFINED__ */

 

 #ifndef __IInternetSecurityManager_INTERFACE_DEFINED__

 #define __IInternetSecurityManager_INTERFACE_DEFINED__

 

 	typedef enum tagURLZONE {

-	    URLZONE_INVALID = -1,

-	    URLZONE_PREDEFINED_MIN = 0,

-	    URLZONE_LOCAL_MACHINE = 0,

-	    URLZONE_INTRANET,

-	    URLZONE_TRUSTED,

-	    URLZONE_INTERNET,

-	    URLZONE_UNTRUSTED,

-	    URLZONE_PREDEFINED_MAX = 999,

-	    URLZONE_USER_MIN = 1000,

-	    URLZONE_USER_MAX = 10000

+		URLZONE_INVALID = -1,

+		URLZONE_PREDEFINED_MIN = 0,

+		URLZONE_LOCAL_MACHINE = 0,

+		URLZONE_INTRANET,

+		URLZONE_TRUSTED,

+		URLZONE_INTERNET,

+		URLZONE_UNTRUSTED,

+		URLZONE_PREDEFINED_MAX = 999,

+		URLZONE_USER_MIN = 1000,

+		URLZONE_USER_MAX = 10000

 	} URLZONE;

 

 	#define URLACTION_ACTIVEX_MIN                                  0x00001200

@@ -334,7 +330,7 @@ EXTERN_C const IID IID_IHTMLAnchorElement;
 

 	static const CLSID IID_IInternetSecurityManager=

 	{ 0x79eac9ee, 0xbaf9, 0x11ce,

-    { 0x8c, 0x82, 0x00, 0xaa, 0x00, 0x4b, 0xa9, 0x0b } };

+	{ 0x8c, 0x82, 0x00, 0xaa, 0x00, 0x4b, 0xa9, 0x0b } };

 

 	#define SID_SInternetSecurityManager         IID_IInternetSecurityManager

 

@@ -384,7 +380,7 @@ private:
 public:

 	IEViewSink(IEView *);

 	virtual ~IEViewSink();

-    // IDispatch

+	// IDispatch

 	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv);

 	STDMETHODIMP_(ULONG) AddRef(void);

 	STDMETHODIMP_(ULONG) Release(void);

@@ -426,8 +422,8 @@ public:
 class IEView:public IDispatch, public IOleClientSite, public IOleInPlaceSite, public IDocHostUIHandler, public IInternetSecurityManager, public IServiceProvider {

 private:

 	static IEView *list;

-   	static CRITICAL_SECTION mutex;

-   	static bool isInited;

+	static CRITICAL_SECTION mutex;

+	static bool isInited;

 	HWND 		parent;

 	HWND		hwnd;

 	IEView		*prev, *next;

@@ -440,19 +436,19 @@ private:
 	IWebBrowser2* pWebBrowser;

 	HTMLBuilder *builder;

 

- 	WNDPROC    	mainWndProc, docWndProc, serverWndProc;

-   	bool        getFocus;

-   	bool		clearRequired;

-   	BSTR		selectedText;

+	WNDPROC    	mainWndProc, docWndProc, serverWndProc;

+	bool        getFocus;

+	bool		clearRequired;

+	BSTR		selectedText;

 	bool		isContactSet;

 	HANDLE		hContact;

 

-    // IUnknown

+	// IUnknown

 	STDMETHODIMP QueryInterface(REFIID riid, PVOID *ppv);

 	STDMETHODIMP_(ULONG) AddRef(void);

 	STDMETHODIMP_(ULONG) Release(void);

 

-    // IDispatch

+	// IDispatch

 	STDMETHOD(GetTypeInfoCount)(UINT*);

 	STDMETHOD(GetTypeInfo)(UINT, LCID, LPTYPEINFO*);

 	STDMETHOD(GetIDsOfNames)(REFIID,LPOLESTR*,UINT,LCID,DISPID*);

@@ -465,8 +461,8 @@ private:
 	STDMETHOD(OnInPlaceActivate)(void);

 	STDMETHOD(OnUIActivate)(void);

 	STDMETHOD(GetWindowContext)(IOleInPlaceFrame **ppFrame, IOleInPlaceUIWindow **ppDoc,

-	                            LPRECT lprcPosRect, LPRECT lprcClipRect,

-                               LPOLEINPLACEFRAMEINFO lpFrameInfo);

+								LPRECT lprcPosRect, LPRECT lprcClipRect,

+							   LPOLEINPLACEFRAMEINFO lpFrameInfo);

 	STDMETHOD(Scroll)(SIZE scrollExtant);

 

 	STDMETHOD(OnUIDeactivate)(BOOL fUndoable);

@@ -486,7 +482,7 @@ private:
 	STDMETHOD(ShowContextMenu)(DWORD dwID, POINT *ppt, IUnknown *pcmdtReserved, IDispatch *pdispReserved);

 	STDMETHOD(GetHostInfo)(DOCHOSTUIINFO *pInfo);

 	STDMETHOD(ShowUI)(DWORD dwID, IOleInPlaceActiveObject *pActiveObject, IOleCommandTarget *pCommandTarget,

-    				IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc);

+					IOleInPlaceFrame *pFrame, IOleInPlaceUIWindow *pDoc);

 	STDMETHOD(HideUI)(void);

 	STDMETHOD(UpdateUI)(void);

 	STDMETHOD(EnableModeless)(BOOL fEnable);

@@ -512,8 +508,8 @@ private:
 	STDMETHOD(GetZoneMappings)(DWORD dwZone, IEnumString **ppenumString, DWORD dwFlags);

 

 	IHTMLDocument2 *getDocument();

-	BSTR 			getHrefFromAnchor(IHTMLElement *element);

-	BSTR 			getSelection();

+	BSTR			getHrefFromAnchor(IHTMLElement *element);

+	BSTR			getSelection();

 	void			setBorder();

 protected:

 	void			navigate(const char *);

@@ -528,18 +524,18 @@ public:
 	void 			translateAccelerator(UINT uMsg, WPARAM wParam, LPARAM lParam);

 	bool			mouseClick(POINT pt);

 	bool			mouseActivate();

-	bool            setFocus(HWND prevFocus);

-   	void            setWindowPos(int x, int y, int cx, int cy);

+	bool			setFocus(HWND prevFocus);

+	void			setWindowPos(int x, int y, int cx, int cy);

 	HTMLBuilder*    getBuilder();

 

 	void			write(const wchar_t *text);

 	void			write(const char *text);

-	void            writef(const char *fmt, ...);

-	void            documentClose();

-	void            rebuildLog();

-	void            scrollToBottom();

-	void            scrollToBottomSoft();

-	void            scrollToTop();

+	void			writef(const char *fmt, ...);

+	void			documentClose();

+	void			rebuildLog();

+	void			scrollToBottom();

+	void			scrollToBottomSoft();

+	void			scrollToTop();

 

 	void            setMainWndProc(WNDPROC);

 	WNDPROC         getMainWndProc();

@@ -557,9 +553,9 @@ public:
 

 	void			setContact(HANDLE hContact);

 

-	static IEView* 	get(HWND);

-	static void 	init();

-	static void 	release();

+	static IEView*	get(HWND);

+	static void		init();

+	static void		release();

 	static void		setOptions();

 

 };

diff --git a/IEView/MUCCHTMLBuilder.cpp b/IEView/MUCCHTMLBuilder.cpp
index 64bb4d6..45e7f21 100644
--- a/IEView/MUCCHTMLBuilder.cpp
+++ b/IEView/MUCCHTMLBuilder.cpp
@@ -42,60 +42,60 @@ MUCCHTMLBuilder::MUCCHTMLBuilder() {
 }

 

 void MUCCHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) {

-    char str[32];

-    int style;

-    DBVARIANT dbv;

-    if (colour) {

-        wsprintfA(str, "Font%dCol", i);

-        *colour = DBGetContactSettingDword(NULL, MUCCMOD, str, 0x000000);

-    }

-    if (lf) {

-        wsprintfA(str, "Font%dSize", i);

-        lf->lfHeight = (char) DBGetContactSettingByte(NULL, MUCCMOD, str, 10);

-        lf->lfHeight = abs(lf->lfHeight);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "Font%dStyle", i);

-        style = DBGetContactSettingByte(NULL, MUCCMOD, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "Font%dSet", i);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, MUCCMOD, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "Font%dFace", i);

-        if (DBGetContactSetting(NULL, MUCCMOD, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[32];

+	int style;

+	DBVARIANT dbv;

+	if (colour) {

+		wsprintfA(str, "Font%dCol", i);

+		*colour = DBGetContactSettingDword(NULL, MUCCMOD, str, 0x000000);

+	}

+	if (lf) {

+		wsprintfA(str, "Font%dSize", i);

+		lf->lfHeight = (char) DBGetContactSettingByte(NULL, MUCCMOD, str, 10);

+		lf->lfHeight = abs(lf->lfHeight);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "Font%dStyle", i);

+		style = DBGetContactSettingByte(NULL, MUCCMOD, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "Font%dSet", i);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, MUCCMOD, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "Font%dFace", i);

+		if (DBGetContactSetting(NULL, MUCCMOD, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check)

 {

-    static char szResult[512];

-    char str[80];

+	static char szResult[512];

+	char str[80];

 

-    DBTIMETOSTRING dbtts;

+	DBTIMETOSTRING dbtts;

 

-    dbtts.cbDest = 70;;

-    dbtts.szDest = str;

+	dbtts.cbDest = 70;;

+	dbtts.szDest = str;

 

 	szResult[0] = '\0';

 	struct tm tm_now, tm_today;

 	time_t now = time(NULL);

 	time_t today;

-    tm_now = *localtime(&now);

-    tm_today = tm_now;

-    tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

-    today = mktime(&tm_today);

+	tm_now = *localtime(&now);

+	tm_today = tm_now;

+	tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

+	today = mktime(&tm_today);

 	if (dwData&IEEDD_MUCC_SHOW_DATE && dwData&IEEDD_MUCC_SHOW_TIME) {

 		if (dwData&IEEDD_MUCC_LONG_DATE) {

 			dbtts.szFormat = dwData&IEEDD_MUCC_SECONDS ? (char *)"D s" : (char *)"D t";

@@ -110,9 +110,9 @@ char *MUCCHTMLBuilder::timestampToString(DWORD dwData, time_t check)
 		dbtts.szFormat = (char *)"";

 	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

-    strncat(szResult, str, 500);

+	strncat(szResult, str, 500);

 	Utils::UTF8Encode(szResult, szResult, 500);

-    return szResult;

+	return szResult;

 }

 

 void MUCCHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {

@@ -130,23 +130,23 @@ void MUCCHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 	}

  	if (protoSettings->getChatMode() == Options::MODE_CSS) {

 	 	const char *externalCSS = protoSettings->getChatCssFilename();

-        Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

+		Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n", externalCSS);

 	} else {

 		HDC hdc = GetDC(NULL);

-	    int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 		Utils::appendText(&output, &outputSize, "<html><head>");

 		Utils::appendText(&output, &outputSize, "<style type=\"text/css\">\n");

 		COLORREF bkgColor = DBGetContactSettingDword(NULL, MUCCMOD, "BackgroundLog", 0xFFFFFF);

 		COLORREF inColor, outColor;

-	    bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

+		bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

 		inColor = outColor = bkgColor;

 		if (protoSettings->getChatFlags() & Options::LOG_IMAGE_ENABLED) {

 			Utils::appendText(&output, &outputSize, ".body {padding: 2px; text-align: left; background-attachment: %s; background-color: #%06X;  background-image: url('%s'); overflow: auto;}\n",

 			protoSettings->getChatFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getChatBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+				 		(int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {vertical-align: middle;}\n");

@@ -176,7 +176,7 @@ void MUCCHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 	setLastEventType(-1);

@@ -184,7 +184,7 @@ void MUCCHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 

 void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {

 

-    IEVIEWEVENTDATA* eventData = event->eventData;

+	IEVIEWEVENTDATA* eventData = event->eventData;

 	for (int eventIdx = 0; eventData!=NULL && (eventIdx < event->count || event->count==-1); eventData = eventData->next, eventIdx++) {

 		DWORD dwData = eventData->dwData;

 		char *style = NULL;

@@ -218,38 +218,38 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 			}

 			const char *className = isSent ? "messageOut" : "messageIn";

 			if (eventData->dwFlags & IEEDF_FORMAT_SIZE && eventData->fontSize > 0) {

-                Utils::appendText(&style, &styleSize, "font-size:%dpt;", eventData->fontSize);

+				Utils::appendText(&style, &styleSize, "font-size:%dpt;", eventData->fontSize);

 			}

 			if (eventData->dwFlags & IEEDF_FORMAT_COLOR && eventData->color!=0xFFFFFFFF) {

-                Utils::appendText(&style, &styleSize, "color:#%06X;", ((eventData->color & 0xFF) << 16) | (eventData->color & 0xFF00) | ((eventData->color & 0xFF0000) >> 16));

+				Utils::appendText(&style, &styleSize, "color:#%06X;", ((eventData->color & 0xFF) << 16) | (eventData->color & 0xFF00) | ((eventData->color & 0xFF0000) >> 16));

 			}

 			if (eventData->dwFlags & IEEDF_FORMAT_FONT) {

-                Utils::appendText(&style, &styleSize, "font-family:%s;", eventData->fontName);

+				Utils::appendText(&style, &styleSize, "font-family:%s;", eventData->fontName);

 			}

 			if (eventData->dwFlags & IEEDF_FORMAT_STYLE) {

-                Utils::appendText(&style, &styleSize, "font-weight: %s;", eventData->fontStyle & IE_FONT_BOLD ? "bold" : "normal");

-                Utils::appendText(&style, &styleSize, "font-style: %s;", eventData->fontStyle & IE_FONT_ITALIC ? "italic" : "normal");

-                Utils::appendText(&style, &styleSize, "text-decoration: %s;", eventData->fontStyle & IE_FONT_UNDERLINE ? "underline" : "none");

+				Utils::appendText(&style, &styleSize, "font-weight: %s;", eventData->fontStyle & IE_FONT_BOLD ? "bold" : "normal");

+				Utils::appendText(&style, &styleSize, "font-style: %s;", eventData->fontStyle & IE_FONT_ITALIC ? "italic" : "normal");

+				Utils::appendText(&style, &styleSize, "text-decoration: %s;", eventData->fontStyle & IE_FONT_UNDERLINE ? "underline" : "none");

 			}

 			Utils::appendText(&output, &outputSize, "<span class=\"%s\"><span style=\"%s\">%s</span></span>", className, style!=NULL ? style : "", szText);

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "</div>\n");

 			if (style!=NULL) free(style);

 		} else if (eventData->iType == IEED_MUCC_EVENT_JOINED || eventData->iType == IEED_MUCC_EVENT_LEFT || eventData->iType == IEED_MUCC_EVENT_TOPIC) {

 			const char *className, *divName;

 			const char *eventText;

 			if (eventData->iType == IEED_MUCC_EVENT_JOINED) {

-                className = "userJoined";

-                divName = "divUserJoined";

+				className = "userJoined";

+				divName = "divUserJoined";

 				eventText = "%s has joined.";

 				szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent);

 			} else if (eventData->iType == IEED_MUCC_EVENT_LEFT) {

-                className = "userLeft";

-                divName = "divUserJoined";

+				className = "userLeft";

+				divName = "divUserJoined";

 				eventText = "%s has left.";

 				szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent);

 			} else {

-                className = "topicChange";

-                divName = "divTopicChange";

+				className = "topicChange";

+				divName = "divTopicChange";

 				eventText = "The topic is %s.";

 				szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_ALL, isSent);

 			}

@@ -261,21 +261,21 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 			Utils::appendText(&output, &outputSize, "<span class=\"%s\">", className);

 			Utils::appendText(&output, &outputSize, Translate(eventText), szText);

 			Utils::appendText(&output, &outputSize, "</span>");

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "</div>\n");

 		} else if (eventData->iType == IEED_MUCC_EVENT_ERROR) {

-            const char *className = "error";

+			const char *className = "error";

 			szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_NONE, isSent);

 			Utils::appendText(&output, &outputSize, "<div class=\"%s\">", "divError");

 			Utils::appendText(&output, &outputSize, "<span class=\"%s\"> %s: %s</span>", className, Translate("Error"), szText);

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "</div>\n");

 		}

 		if (szName!=NULL) delete szName;

 		if (szText!=NULL) delete szText;

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

-    }

+	}

 //	view->scrollToBottom();

 }

 

diff --git a/IEView/MUCCHTMLBuilder.h b/IEView/MUCCHTMLBuilder.h
index 2a1be00..d6c00df 100644
--- a/IEView/MUCCHTMLBuilder.h
+++ b/IEView/MUCCHTMLBuilder.h
@@ -28,12 +28,12 @@ class MUCCHTMLBuilder;
 class MUCCHTMLBuilder:public HTMLBuilder

 {

 protected:

-    void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

+	void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

 	char *timestampToString(DWORD dwFlags, time_t check);

 	void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);

 	bool isDbEventShown(DBEVENTINFO * dbei);

 public:

-    MUCCHTMLBuilder();

+	MUCCHTMLBuilder();

 	void buildHead(IEView *, IEVIEWEVENT *event);

 	void appendEvent(IEView *, IEVIEWEVENT *event);

 };

diff --git a/IEView/Options.cpp b/IEView/Options.cpp
index 98dfb38..afd577b 100644
--- a/IEView/Options.cpp
+++ b/IEView/Options.cpp
@@ -356,7 +356,7 @@ static void RefreshIcons() {
 

 static void RefreshProtoList(HWND hwndDlg, int mode, bool protoTemplates) {

 	int i;

-    HTREEITEM hItem = NULL;

+	HTREEITEM hItem = NULL;

 	HWND hProtoList = GetDlgItem(hwndDlg, IDC_PROTOLIST);

 	TreeView_DeleteAllItems(hProtoList);

 	TreeView_SetImageList(hProtoList, hProtocolImageList, TVSIL_NORMAL);

@@ -515,11 +515,11 @@ static INT_PTR CALLBACK IEViewGeneralOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 		{

 			switch (LOWORD(wParam)) {

 			case IDC_ENABLE_BBCODES:

-            case IDC_ENABLE_FLASH:

-            case IDC_ENABLE_MATHMODULE:

-            case IDC_ENABLE_PNGHACK:

-            case IDC_SMILEYS_IN_NAMES:

-            case IDC_NO_BORDER:

+			case IDC_ENABLE_FLASH:

+			case IDC_ENABLE_MATHMODULE:

+			case IDC_ENABLE_PNGHACK:

+			case IDC_SMILEYS_IN_NAMES:

+			case IDC_NO_BORDER:

 			case IDC_EMBED_SIZE:

 				MarkChanges(1, hwndDlg);

 				break;

@@ -585,9 +585,9 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 		{

 			switch (LOWORD(wParam)) {

 			case IDC_BACKGROUND_IMAGE_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME_RTL:

-            case IDC_TEMPLATES_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME_RTL:

+			case IDC_TEMPLATES_FILENAME:

 				if ((HWND)lParam==GetFocus() && HIWORD(wParam)==EN_CHANGE)

 					MarkChanges(2, hwndDlg);

 				break;

@@ -602,7 +602,7 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 				MarkChanges(2, hwndDlg);

 				break;

 			case IDC_BACKGROUND_IMAGE:

-                bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

+				bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_BACKGROUND_IMAGE), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_SCROLL_BACKGROUND_IMAGE), bChecked);

@@ -674,8 +674,8 @@ static INT_PTR CALLBACK IEViewSRMMOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 							MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);

 							TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);

 							if (TVHT_ONITEMSTATEICON & ht.flags) {

-                                PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

-                                return FALSE;

+								PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

+								return FALSE;

 							}

 						}

 						break;

@@ -725,9 +725,9 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 		{

 			switch (LOWORD(wParam)) {

 			case IDC_BACKGROUND_IMAGE_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME_RTL:

-            case IDC_TEMPLATES_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME_RTL:

+			case IDC_TEMPLATES_FILENAME:

 				if ((HWND)lParam==GetFocus() && HIWORD(wParam)==EN_CHANGE)

 					MarkChanges(4, hwndDlg);

 				break;

@@ -742,7 +742,7 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 				MarkChanges(4, hwndDlg);

 				break;

 			case IDC_BACKGROUND_IMAGE:

-                bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

+				bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_BACKGROUND_IMAGE), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_SCROLL_BACKGROUND_IMAGE), bChecked);

@@ -814,8 +814,8 @@ static INT_PTR CALLBACK IEViewHistoryOptDlgProc(HWND hwndDlg, UINT msg, WPARAM w
 							MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);

 							TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);

 							if (TVHT_ONITEMSTATEICON & ht.flags) {

-                                PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

-                                return FALSE;

+								PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

+								return FALSE;

 							}

 						}

 						break;

@@ -866,9 +866,9 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 		{

 			switch (LOWORD(wParam)) {

 			case IDC_BACKGROUND_IMAGE_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME:

-            case IDC_EXTERNALCSS_FILENAME_RTL:

-            case IDC_TEMPLATES_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME:

+			case IDC_EXTERNALCSS_FILENAME_RTL:

+			case IDC_TEMPLATES_FILENAME:

 				if ((HWND)lParam==GetFocus() && HIWORD(wParam)==EN_CHANGE)

 					MarkChanges(8, hwndDlg);

 				break;

@@ -883,7 +883,7 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 				MarkChanges(8, hwndDlg);

 				break;

 			case IDC_BACKGROUND_IMAGE:

-                bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

+				bChecked = IsDlgButtonChecked(hwndDlg, IDC_MODE_COMPATIBLE) && IsDlgButtonChecked(hwndDlg, IDC_BACKGROUND_IMAGE);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BACKGROUND_IMAGE_FILENAME), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE_BACKGROUND_IMAGE), bChecked);

 				EnableWindow(GetDlgItem(hwndDlg, IDC_SCROLL_BACKGROUND_IMAGE), bChecked);

@@ -955,8 +955,8 @@ static INT_PTR CALLBACK IEViewGroupChatsOptDlgProc(HWND hwndDlg, UINT msg, WPARA
 							MapWindowPoints(HWND_DESKTOP, ((LPNMHDR)lParam)->hwndFrom, &ht.pt, 1);

 							TreeView_HitTest(((LPNMHDR)lParam)->hwndFrom, &ht);

 							if (TVHT_ONITEMSTATEICON & ht.flags) {

-                                PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

-                                return FALSE;

+								PostMessage(hwndDlg, UM_CHECKSTATECHANGE, (WPARAM)((LPNMHDR)lParam)->hwndFrom, (LPARAM)ht.hItem);

+								return FALSE;

 							}

 						}

 						break;

diff --git a/IEView/SRMMHTMLBuilder.cpp b/IEView/SRMMHTMLBuilder.cpp
index 3b0ed17..f142cf3 100644
--- a/IEView/SRMMHTMLBuilder.cpp
+++ b/IEView/SRMMHTMLBuilder.cpp
@@ -50,70 +50,70 @@ static const char *classNames[] = {
 

 bool SRMMHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)

 {

-    switch (dbei->eventType) {

-        case EVENTTYPE_MESSAGE:

-            return 1;

-        case EVENTTYPE_STATUSCHANGE:

-            if (dbei->flags & DBEF_READ) return 0;

-            return 1;

-    }

-    return 0;

+	switch (dbei->eventType) {

+		case EVENTTYPE_MESSAGE:

+			return 1;

+		case EVENTTYPE_STATUSCHANGE:

+			if (dbei->flags & DBEF_READ) return 0;

+			return 1;

+	}

+	return 0;

 }

 

 void SRMMHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) {

-    char str[32];

-    int style;

-    DBVARIANT dbv;

-    if (colour) {

-        wsprintfA(str, "SRMFont%dCol", i);

-        *colour = DBGetContactSettingDword(NULL, SRMMMOD, str, 0x000000);

-    }

-    if (lf) {

-        wsprintfA(str, "SRMFont%dSize", i);

-        lf->lfHeight = (char) DBGetContactSettingByte(NULL, SRMMMOD, str, 10);

-        lf->lfHeight = abs(lf->lfHeight);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "SRMFont%dSty", i);

-        style = DBGetContactSettingByte(NULL, SRMMMOD, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "SRMFont%dSet", i);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, SRMMMOD, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "SRMFont%d", i);

-        if (DBGetContactSetting(NULL, SRMMMOD, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[32];

+	int style;

+	DBVARIANT dbv;

+	if (colour) {

+		wsprintfA(str, "SRMFont%dCol", i);

+		*colour = DBGetContactSettingDword(NULL, SRMMMOD, str, 0x000000);

+	}

+	if (lf) {

+		wsprintfA(str, "SRMFont%dSize", i);

+		lf->lfHeight = (char) DBGetContactSettingByte(NULL, SRMMMOD, str, 10);

+		lf->lfHeight = abs(lf->lfHeight);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "SRMFont%dSty", i);

+		style = DBGetContactSettingByte(NULL, SRMMMOD, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "SRMFont%dSet", i);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, SRMMMOD, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "SRMFont%d", i);

+		if (DBGetContactSetting(NULL, SRMMMOD, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 char *SRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check) {

-    static char szResult[512];

-    char str[80];

-    DBTIMETOSTRING dbtts;

-    dbtts.cbDest = 70;;

-    dbtts.szDest = str;

-    szResult[0] = '\0';

-    if(!(dwFlags & SMF_LOG_SHOWDATES)) {

-        dbtts.szFormat = (char *)"s";

-    }

-    else {

-        dbtts.szFormat = (char *)"d t";

-    }

+	static char szResult[512];

+	char str[80];

+	DBTIMETOSTRING dbtts;

+	dbtts.cbDest = 70;;

+	dbtts.szDest = str;

+	szResult[0] = '\0';

+	if(!(dwFlags & SMF_LOG_SHOWDATES)) {

+		dbtts.szFormat = (char *)"s";

+	}

+	else {

+		dbtts.szFormat = (char *)"d t";

+	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

-    strncat(szResult, str, 500);

+	strncat(szResult, str, 500);

 	Utils::UTF8Encode(szResult, szResult, 500);

-    return szResult;

+	return szResult;

 }

 

 

@@ -132,22 +132,22 @@ void SRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 	}

  	if (protoSettings->getSRMMMode() == Options::MODE_CSS) {

 	 	const char *externalCSS = (event->dwFlags & IEEF_RTL) ? protoSettings->getSRMMCssFilenameRtl() : protoSettings->getSRMMCssFilename();

-        Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n",externalCSS);

+		Utils::appendText(&output, &outputSize, "<html><head><link rel=\"stylesheet\" href=\"%s\"/></head><body class=\"body\">\n",externalCSS);

 	} else {

 		HDC hdc = GetDC(NULL);

-	    int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 		Utils::appendText(&output, &outputSize, "<html><head><style type=\"text/css\">\n");

 		COLORREF bkgColor = DBGetContactSettingDword(NULL, SRMMMOD, "BkgColour", 0xFFFFFF);

 		COLORREF inColor, outColor;

-	    bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

+		bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

 		inColor = outColor = bkgColor;

 		if (protoSettings->getSRMMFlags() & Options::LOG_IMAGE_ENABLED) {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-attachment: %s; background-color: #%06X;  background-image: url('%s'); overflow: auto;}\n",

 			protoSettings->getSRMMFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getSRMMBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+				 		 (int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {vertical-align: middle;}\n");

@@ -171,7 +171,7 @@ void SRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 

@@ -180,10 +180,10 @@ void SRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 void SRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {

 

 	DWORD dwFlags = DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWTIME, 0) ? SMF_LOG_SHOWTIME : 0;

-    dwFlags |= !DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_HIDENAMES, 0) ? SMF_LOG_SHOWNICK : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWDATE, 0) ? SMF_LOG_SHOWDATES : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, 0) ? SMF_LOG_SHOWICONS : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCHANGES, 0) ? SMF_LOG_SHOWSTATUSCHANGES : 0;

+	dwFlags |= !DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_HIDENAMES, 0) ? SMF_LOG_SHOWNICK : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWDATE, 0) ? SMF_LOG_SHOWDATES : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, 0) ? SMF_LOG_SHOWICONS : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCHANGES, 0) ? SMF_LOG_SHOWSTATUSCHANGES : 0;

 

 	char *szRealProto = getRealProto(event->hContact);

 	IEVIEWEVENTDATA* eventData = event->eventData;

@@ -200,13 +200,13 @@ void SRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 			char *szText = NULL;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK) {

 				szName = encodeUTF8(eventData->pszNickW, szRealProto, ENF_NAMESMILEYS);

-   			} else {

-                szName = encodeUTF8(eventData->pszNick, szRealProto, ENF_NAMESMILEYS);

+			} else {

+				szName = encodeUTF8(eventData->pszNick, szRealProto, ENF_NAMESMILEYS);

 			}

 			if (eventData->dwFlags & IEEDF_UNICODE_TEXT) {

 				szText = encodeUTF8(eventData->pszTextW, szRealProto, ENF_ALL);

-   			} else {

-                szText = encodeUTF8(eventData->pszText, event->codepage, szRealProto, ENF_ALL);

+			} else {

+				szText = encodeUTF8(eventData->pszText, event->codepage, szRealProto, ENF_ALL);

 			}

 

 			/* SRMM-specific formatting */

@@ -235,7 +235,7 @@ void SRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 				}

 			}

 			if (dwFlags & SMF_LOG_SHOWNICK) {

-                if (dbei.eventType == EVENTTYPE_STATUSCHANGE) {

+				if (dbei.eventType == EVENTTYPE_STATUSCHANGE) {

 					Utils::appendText(&output, &outputSize, "<span class=\"notices\">%s </span>", szName);

 				} else {

 					Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span><span class=\"%s\">: </span>",

@@ -246,20 +246,20 @@ void SRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {
 			if (dbei.eventType == EVENTTYPE_MESSAGE) {

 				className = isSent ? "messageOut" : "messageIn";

 			} else if (dbei.eventType == EVENTTYPE_STATUSCHANGE) {

-                className = "notices";

+				className = "notices";

 			}

-            Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

+			Utils::appendText(&output, &outputSize, "</div>\n");

 			event->hDbEventFirst = hCurDbEvent;

 			if (szName!=NULL) delete szName;

 			if (szText!=NULL) delete szText;

 		}

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

-    }

-    if (szRealProto!=NULL) delete szRealProto;

+	}

+	if (szRealProto!=NULL) delete szRealProto;

 }

 

 void SRMMHTMLBuilder::appendEvent(IEView *view, IEVIEWEVENT *event) {

diff --git a/IEView/SRMMHTMLBuilder.h b/IEView/SRMMHTMLBuilder.h
index 32153df..801f1a6 100644
--- a/IEView/SRMMHTMLBuilder.h
+++ b/IEView/SRMMHTMLBuilder.h
@@ -28,7 +28,7 @@ class SRMMHTMLBuilder;
 class SRMMHTMLBuilder:public TemplateHTMLBuilder

 {

 protected:

-    virtual void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

+	virtual void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

 	char *timestampToString(DWORD dwFlags, time_t check);

 	bool isDbEventShown(DBEVENTINFO * dbei);

 	void 	appendEventNonTemplate(IEView *, IEVIEWEVENT *event);

diff --git a/IEView/ScriverHTMLBuilder.cpp b/IEView/ScriverHTMLBuilder.cpp
index 567dedd..288d7e7 100644
--- a/IEView/ScriverHTMLBuilder.cpp
+++ b/IEView/ScriverHTMLBuilder.cpp
@@ -71,108 +71,108 @@ ScriverHTMLBuilder::ScriverHTMLBuilder() {
 

 bool ScriverHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)

 {

-    switch (dbei->eventType) {

-        case EVENTTYPE_MESSAGE:

-            return 1;

-        case EVENTTYPE_STATUSCHANGE:

-          //  if (dbei->flags & DBEF_READ) return 0;

-            return 1;

-        case EVENTTYPE_URL:

-            return 1;

-        case EVENTTYPE_FILE:

+	switch (dbei->eventType) {

+		case EVENTTYPE_MESSAGE:

 			return 1;

-    }

-    return 0;

+		case EVENTTYPE_STATUSCHANGE:

+		  //  if (dbei->flags & DBEF_READ) return 0;

+			return 1;

+		case EVENTTYPE_URL:

+			return 1;

+		case EVENTTYPE_FILE:

+			return 1;

+	}

+	return 0;

 }

 

 void ScriverHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) {

-    char str[32];

-    int style;

-    DBVARIANT dbv;

-    if (colour) {

-        wsprintfA(str, "SRMFont%dCol", i);

-        *colour = DBGetContactSettingDword(NULL, SRMMMOD, str, 0x000000);

-    }

-    if (lf) {

-        wsprintfA(str, "SRMFont%dSize", i);

-        lf->lfHeight = (char) DBGetContactSettingByte(NULL, SRMMMOD, str, 10);

-        lf->lfHeight = abs(lf->lfHeight);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "SRMFont%dSty", i);

-        style = DBGetContactSettingByte(NULL, SRMMMOD, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "SRMFont%dSet", i);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, SRMMMOD, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "SRMFont%d", i);

-        if (DBGetContactSetting(NULL, SRMMMOD, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[32];

+	int style;

+	DBVARIANT dbv;

+	if (colour) {

+		wsprintfA(str, "SRMFont%dCol", i);

+		*colour = DBGetContactSettingDword(NULL, SRMMMOD, str, 0x000000);

+	}

+	if (lf) {

+		wsprintfA(str, "SRMFont%dSize", i);

+		lf->lfHeight = (char) DBGetContactSettingByte(NULL, SRMMMOD, str, 10);

+		lf->lfHeight = abs(lf->lfHeight);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "SRMFont%dSty", i);

+		style = DBGetContactSettingByte(NULL, SRMMMOD, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "SRMFont%dSet", i);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, SRMMMOD, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "SRMFont%d", i);

+		if (DBGetContactSetting(NULL, SRMMMOD, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 char *ScriverHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mode) {

-    static char szResult[512];

-    char str[80];

+	static char szResult[512];

+	char str[80];

 	char format[20];

-    DBTIMETOSTRING dbtts;

+	DBTIMETOSTRING dbtts;

 

-    szResult[0] = '\0';

-    format[0] = '\0';

+	szResult[0] = '\0';

+	format[0] = '\0';

 

-    dbtts.cbDest = 70;;

-    dbtts.szDest = str;

+	dbtts.cbDest = 70;;

+	dbtts.szDest = str;

 	dbtts.szFormat = format;

 

-    if ((mode == 0 || mode == 1) && (dwFlags & SMF_LOG_SHOWDATE)) {

+	if ((mode == 0 || mode == 1) && (dwFlags & SMF_LOG_SHOWDATE)) {

 		struct tm tm_now, tm_today;

 		time_t now = time(NULL);

 		time_t today;

-        tm_now = *localtime(&now);

-        tm_today = tm_now;

-        tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

-        today = mktime(&tm_today);

+		tm_now = *localtime(&now);

+		tm_today = tm_now;

+		tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

+		today = mktime(&tm_today);

 

-        if(dwFlags & SMF_LOG_USERELATIVEDATE && check >= today) {

-            strcpy(szResult, Translate("Today"));

-            if (mode == 0) {

+		if(dwFlags & SMF_LOG_USERELATIVEDATE && check >= today) {

+			strcpy(szResult, Translate("Today"));

+			if (mode == 0) {

 				strcat(szResult, ",");

-            }

-        } else if(dwFlags & SMF_LOG_USERELATIVEDATE && check > (today - 86400)) {

-            strcpy(szResult, Translate("Yesterday"));

-            if (mode == 0) {

+			}

+		} else if(dwFlags & SMF_LOG_USERELATIVEDATE && check > (today - 86400)) {

+			strcpy(szResult, Translate("Yesterday"));

+			if (mode == 0) {

 				strcat(szResult, ",");

-            }

-        } else {

-            if(dwFlags & SMF_LOG_USELONGDATE)

+			}

+		} else {

+			if(dwFlags & SMF_LOG_USELONGDATE)

 				strcpy(format, "D");

-            else

+			else

 				strcpy(format, "d");

-        }

-    }

-    if (mode == 0 || mode == 2) {

-    	if (mode == 0 && (dwFlags & SMF_LOG_SHOWDATE)) {

+		}

+	}

+	if (mode == 0 || mode == 2) {

+		if (mode == 0 && (dwFlags & SMF_LOG_SHOWDATE)) {

 			strcat(format, " ");

-    	}

+		}

 		strcat(format, (dwFlags & SMF_LOG_SHOWSECONDS) ? "s" : "t");

-    }

-    if (format[0] != '\0') {

+	}

+	if (format[0] != '\0') {

 //		CallService(MS_DB_TIME_TIMESTAMPTOSTRINGT, check, (LPARAM) & dbtts);

 		CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

 		//_tcsncat(szResult, str, 500);

 		strncat(szResult, str, 500);

-    }

+	}

 	Utils::UTF8Encode(szResult, szResult, 500);

 	return szResult;

 }

@@ -200,7 +200,7 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		}

 	} else {

 		HDC hdc = GetDC(NULL);

-	    int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 		Utils::appendText(&output, &outputSize, "<html><head>");

 		Utils::appendText(&output, &outputSize, "<style type=\"text/css\">\n");

@@ -208,16 +208,16 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		COLORREF inColor = DBGetContactSettingDword(NULL, SRMMMOD, "IncomingBkgColour", 0xFFFFFF);

 		COLORREF outColor = DBGetContactSettingDword(NULL, SRMMMOD, "OutgoingBkgColour", 0xFFFFFF);

 		COLORREF lineColor = DBGetContactSettingDword(NULL, SRMMMOD, "LineColour", 0xFFFFFF);

-	    bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

+		bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

 		inColor= (((inColor & 0xFF) << 16) | (inColor & 0xFF00) | ((inColor & 0xFF0000) >> 16));

 		outColor= (((outColor & 0xFF) << 16) | (outColor & 0xFF00) | ((outColor & 0xFF0000) >> 16));

-	    lineColor= (((lineColor & 0xFF) << 16) | (lineColor & 0xFF00) | ((lineColor & 0xFF0000) >> 16));

+		lineColor= (((lineColor & 0xFF) << 16) | (lineColor & 0xFF00) | ((lineColor & 0xFF0000) >> 16));

 		if (protoSettings->getSRMMFlags() & Options::LOG_IMAGE_ENABLED) {

 			Utils::appendText(&output, &outputSize, ".body {padding: 2px; text-align: left; background-attachment: %s; background-color: #%06X;  background-image: url('%s'); overflow: auto;}\n",

 			protoSettings->getSRMMFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getSRMMBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+				 		 (int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {}\n");

@@ -234,15 +234,15 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 			Utils::appendText(&output, &outputSize, ".divIn {padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOut {padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInGrid {padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) lineColor, (int) inColor);

+				(int) lineColor, (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutGrid {padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) lineColor, (int) outColor);

+				(int) lineColor, (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInGridRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) lineColor, (int) inColor);

+				(int) lineColor, (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutGridRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) lineColor, (int) outColor);

+				(int) lineColor, (int) outColor);

 		}

 		Utils::appendText(&output, &outputSize, ".divNotice {padding-left: 2px; padding-right: 2px; word-wrap: break-word;}\n");

 		Utils::appendText(&output, &outputSize, ".divNoticeGrid {padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X}\n", (int) lineColor);

@@ -261,7 +261,7 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 	setLastEventType(-1);

@@ -270,17 +270,17 @@ void ScriverHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) {

 	bool showColon;

 	DWORD dwFlags = DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWTIME, 0) ? SMF_LOG_SHOWTIME : 0;

-    dwFlags |= !DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_HIDENAMES, 0) ? SMF_LOG_SHOWNICK : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWDATE, 0) ? SMF_LOG_SHOWDATE : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, 0) ? SMF_LOG_SHOWICONS : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCHANGES, 0) ? SMF_LOG_SHOWSTATUSCHANGES : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSECONDS, 0) ? SMF_LOG_SHOWSECONDS : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_USERELATIVEDATE, 0) ? SMF_LOG_USERELATIVEDATE : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_USELONGDATE, 0) ? SMF_LOG_USELONGDATE : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_GROUPMESSAGES, 0) ? SMF_LOG_GROUPMESSAGES : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_MARKFOLLOWUPS, 0) ? SMF_LOG_MARKFOLLOWUPS : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_MESSAGEONNEWLINE, 0) ? SMF_LOG_MSGONNEWLINE : 0;

-    dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_DRAWLINES, 0) ? SMF_LOG_DRAWLINES : 0;

+	dwFlags |= !DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_HIDENAMES, 0) ? SMF_LOG_SHOWNICK : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWDATE, 0) ? SMF_LOG_SHOWDATE : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWLOGICONS, 0) ? SMF_LOG_SHOWICONS : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSTATUSCHANGES, 0) ? SMF_LOG_SHOWSTATUSCHANGES : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_SHOWSECONDS, 0) ? SMF_LOG_SHOWSECONDS : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_USERELATIVEDATE, 0) ? SMF_LOG_USERELATIVEDATE : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_USELONGDATE, 0) ? SMF_LOG_USELONGDATE : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_GROUPMESSAGES, 0) ? SMF_LOG_GROUPMESSAGES : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_MARKFOLLOWUPS, 0) ? SMF_LOG_MARKFOLLOWUPS : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_MESSAGEONNEWLINE, 0) ? SMF_LOG_MSGONNEWLINE : 0;

+	dwFlags |= DBGetContactSettingByte(NULL, SRMMMOD, SRMSGSET_DRAWLINES, 0) ? SMF_LOG_DRAWLINES : 0;

 

 	char *szRealProto = getRealProto(event->hContact);

 	IEVIEWEVENTDATA* eventData = event->eventData;

@@ -368,8 +368,8 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 				}

 				showColon = true;

 			}

-   			if ((dwFlags & SMF_LOG_SHOWNICK && eventData->iType == IEED_EVENT_MESSAGE && isGroupBreak) || eventData->iType == IEED_EVENT_STATUSCHANGE ) {

-	            if (eventData->iType == IEED_EVENT_MESSAGE) {

+			if ((dwFlags & SMF_LOG_SHOWNICK && eventData->iType == IEED_EVENT_MESSAGE && isGroupBreak) || eventData->iType == IEED_EVENT_STATUSCHANGE ) {

+				if (eventData->iType == IEED_EVENT_MESSAGE) {

 					if (showColon) {

 						Utils::appendText(&output, &outputSize, "<span class=\"%s\"> %s</span>",

 									isSent ? "nameOut" : "nameIn",

@@ -379,7 +379,7 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 									isSent ? "nameOut" : "nameIn",

 									szName);

 					}

-                    showColon = true;

+					showColon = true;

 					if (dwFlags & SMF_LOG_GROUPMESSAGES) {

 						Utils::appendText(&output, &outputSize, "<br>");

 						showColon = false;

@@ -405,36 +405,36 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 				}

 				className = isSent ? "messageOut" : "messageIn";

 			} else {

-                className = "notices";

+				className = "notices";

 			}

 			if (eventData->iType == IEED_EVENT_FILE) {

 				if (isSent) {

-	            	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("File sent"), szText);

+					Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("File sent"), szText);

 				} else {

-	            	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("File received"), szText);

+					Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("File received"), szText);

 				}

 			} else if (eventData->iType == IEED_EVENT_URL) {

 				if (isSent) {

-	            	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("URL sent"), szText);

+					Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("URL sent"), szText);

 				} else {

-	            	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("URL received"), szText);

+					Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s: %s</span>", className, Translate("URL received"), szText);

 				}

 			} else {

-            	Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

+				Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

 			}

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

 			setLastEventTime(eventData->time);

 			if (szName!=NULL) delete szName;

 			if (szText!=NULL) delete szText;

 		}

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

-    }

-    if (szRealProto!=NULL) delete szRealProto;

-    view->documentClose();

+	}

+	if (szRealProto!=NULL) delete szRealProto;

+	view->documentClose();

 //	view->scrollToBottom();

 }

 

diff --git a/IEView/ScriverHTMLBuilder.h b/IEView/ScriverHTMLBuilder.h
index c9fc41f..6652ced 100644
--- a/IEView/ScriverHTMLBuilder.h
+++ b/IEView/ScriverHTMLBuilder.h
@@ -28,13 +28,13 @@ class ScriverHTMLBuilder;
 class ScriverHTMLBuilder:public TemplateHTMLBuilder

 {

 protected:

-    void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

+	void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

 	char *timestampToString(DWORD dwFlags, time_t check, int groupStart);

 	DWORD startedTime;

 	bool isDbEventShown(DBEVENTINFO * dbei);

 	void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);

 public:

-    ScriverHTMLBuilder();

+	ScriverHTMLBuilder();

 	void buildHead(IEView *, IEVIEWEVENT *event);

 	void appendEvent(IEView *, IEVIEWEVENT *event);

 };

diff --git a/IEView/TabSRMMHTMLBuilder.cpp b/IEView/TabSRMMHTMLBuilder.cpp
index 3caf7ab..42bc5fc 100644
--- a/IEView/TabSRMMHTMLBuilder.cpp
+++ b/IEView/TabSRMMHTMLBuilder.cpp
@@ -87,119 +87,119 @@ TabSRMMHTMLBuilder::TabSRMMHTMLBuilder() {
 

 bool TabSRMMHTMLBuilder::isDbEventShown(DWORD dwFlags, DBEVENTINFO * dbei)

 {

-    switch (dbei->eventType) {

-        case EVENTTYPE_MESSAGE:

-            return 1;

-            break;

-        case EVENTTYPE_STATUSCHANGE:

-            return 1;

-            break;

-        case EVENTTYPE_URL:

-            if(dwFlags & MWF_SHOW_URLEVENTS) return 1;

-            break;

-        case EVENTTYPE_FILE:

-            if(dwFlags & MWF_SHOW_FILEEVENTS) return 1;

-            break;

-    }

-    return 0;

+	switch (dbei->eventType) {

+		case EVENTTYPE_MESSAGE:

+			return 1;

+			break;

+		case EVENTTYPE_STATUSCHANGE:

+			return 1;

+			break;

+		case EVENTTYPE_URL:

+			if(dwFlags & MWF_SHOW_URLEVENTS) return 1;

+			break;

+		case EVENTTYPE_FILE:

+			if(dwFlags & MWF_SHOW_FILEEVENTS) return 1;

+			break;

+	}

+	return 0;

 }

 

 bool TabSRMMHTMLBuilder::isDbEventShown(DBEVENTINFO * dbei)

 {

 	DWORD dwFlags2 = DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;

-    dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;

-    return isDbEventShown(dwFlags2, dbei);

+	dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;

+	return isDbEventShown(dwFlags2, dbei);

 }

 

 void TabSRMMHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) {

-    char str[32];

-    int style;

-    DBVARIANT dbv;

-    if (colour) {

-        wsprintfA(str, "Font%dCol", i);

-        *colour = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, str, 0x000000);

-    }

-    if (lf) {

-        HDC hdc = GetDC(NULL);

-        wsprintfA(str, "Font%dSize", i);

-//        if(i == H_MSGFONTID_DIVIDERS)

-  //          lf->lfHeight = 5;

-     //   else {

-            lf->lfHeight = (char) DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, 10);

-//            lf->lfHeight= MulDiv(lf->lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 74);

-       // }

-        ReleaseDC(NULL,hdc);

-        lf->lfWidth = 0;

-        lf->lfEscapement = 0;

-        lf->lfOrientation = 0;

-        wsprintfA(str, "Font%dSty", i);

-        style = DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, 0);

-        lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

-        lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

-        lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

-        lf->lfStrikeOut = 0;

-        wsprintfA(str, "Font%dSet", i);

-        lf->lfCharSet = DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, DEFAULT_CHARSET);

-        lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

-        lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

-        lf->lfQuality = DEFAULT_QUALITY;

-        lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

-        wsprintfA(str, "Font%d", i);

-        if (DBGetContactSetting(NULL, TABSRMM_FONTMODULE, str, &dbv))

-            lstrcpyA(lf->lfFaceName, "Verdana");

-        else {

-            lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

-            DBFreeVariant(&dbv);

-        }

-    }

+	char str[32];

+	int style;

+	DBVARIANT dbv;

+	if (colour) {

+		wsprintfA(str, "Font%dCol", i);

+		*colour = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, str, 0x000000);

+	}

+	if (lf) {

+		HDC hdc = GetDC(NULL);

+		wsprintfA(str, "Font%dSize", i);

+//		if(i == H_MSGFONTID_DIVIDERS)

+  //		  lf->lfHeight = 5;

+	 //   else {

+			lf->lfHeight = (char) DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, 10);

+//			lf->lfHeight= MulDiv(lf->lfHeight, GetDeviceCaps(hdc, LOGPIXELSY), 74);

+	   // }

+		ReleaseDC(NULL,hdc);

+		lf->lfWidth = 0;

+		lf->lfEscapement = 0;

+		lf->lfOrientation = 0;

+		wsprintfA(str, "Font%dSty", i);

+		style = DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, 0);

+		lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL;

+		lf->lfItalic = style & FONTF_ITALIC ? 1 : 0;

+		lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0;

+		lf->lfStrikeOut = 0;

+		wsprintfA(str, "Font%dSet", i);

+		lf->lfCharSet = DBGetContactSettingByte(NULL, TABSRMM_FONTMODULE, str, DEFAULT_CHARSET);

+		lf->lfOutPrecision = OUT_DEFAULT_PRECIS;

+		lf->lfClipPrecision = CLIP_DEFAULT_PRECIS;

+		lf->lfQuality = DEFAULT_QUALITY;

+		lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE;

+		wsprintfA(str, "Font%d", i);

+		if (DBGetContactSetting(NULL, TABSRMM_FONTMODULE, str, &dbv))

+			lstrcpyA(lf->lfFaceName, "Verdana");

+		else {

+			lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName));

+			DBFreeVariant(&dbv);

+		}

+	}

 }

 

 char *TabSRMMHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int isGroupBreak)

 {

-    static char szResult[512];

-    char str[80];

-

-    DBTIMETOSTRING dbtts;

-

-    struct tm tm_now, tm_today;

-    time_t now = time(NULL);

-    time_t today;

-

-    dbtts.cbDest = 70;;

-    dbtts.szDest = str;

-

-    if(!isGroupBreak || !(dwFlags & MWF_LOG_SHOWDATES)) {

-        dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

-        szResult[0] = '\0';

-    }

-    else {

-        tm_now = *localtime(&now);

-        tm_today = tm_now;

-        tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

-        today = mktime(&tm_today);

-

-        if(dwFlags & MWF_LOG_USERELATIVEDATES && check >= today) {

-            dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

-            strcpy(szResult, Translate("Today"));

-	        strcat(szResult, ", ");

-        }

-        else if(dwFlags & MWF_LOG_USERELATIVEDATES && check > (today - 86400)) {

-            dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

-            strcpy(szResult, Translate("Yesterday"));

-	        strcat(szResult, ", ");

-        }

-        else {

-            if(dwFlags & MWF_LOG_LONGDATES)

-                dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"D s" : (char *)"D t";

-            else

-                dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"d s" : (char *)"d t";

-            szResult[0] = '\0';

-        }

-    }

+	static char szResult[512];

+	char str[80];

+

+	DBTIMETOSTRING dbtts;

+

+	struct tm tm_now, tm_today;

+	time_t now = time(NULL);

+	time_t today;

+

+	dbtts.cbDest = 70;;

+	dbtts.szDest = str;

+

+	if(!isGroupBreak || !(dwFlags & MWF_LOG_SHOWDATES)) {

+		dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

+		szResult[0] = '\0';

+	}

+	else {

+		tm_now = *localtime(&now);

+		tm_today = tm_now;

+		tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

+		today = mktime(&tm_today);

+

+		if(dwFlags & MWF_LOG_USERELATIVEDATES && check >= today) {

+			dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

+			strcpy(szResult, Translate("Today"));

+			strcat(szResult, ", ");

+		}

+		else if(dwFlags & MWF_LOG_USERELATIVEDATES && check > (today - 86400)) {

+			dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"s" : (char *)"t";

+			strcpy(szResult, Translate("Yesterday"));

+			strcat(szResult, ", ");

+		}

+		else {

+			if(dwFlags & MWF_LOG_LONGDATES)

+				dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"D s" : (char *)"D t";

+			else

+				dbtts.szFormat = (dwFlags & MWF_LOG_SHOWSECONDS) ? (char *)"d s" : (char *)"d t";

+			szResult[0] = '\0';

+		}

+	}

 	CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

-    strncat(szResult, str, 500);

+	strncat(szResult, str, 500);

 	Utils::UTF8Encode(szResult, szResult, 500);

-    return szResult;

+	return szResult;

 }

 

 

@@ -226,20 +226,20 @@ void TabSRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		}

 	} else {

 		HDC hdc = GetDC(NULL);

-	    int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		int logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

 		ReleaseDC(NULL, hdc);

 	 	DWORD dwFlags = DBGetContactSettingDword(NULL, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);

 		Utils::appendText(&output, &outputSize, "<html><head><style type=\"text/css\">\n");

 		COLORREF inColor, outColor;

 		COLORREF bkgColor = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, "BkgColour", 0xFFFFFF);

-	    bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

+		bkgColor= (((bkgColor & 0xFF) << 16) | (bkgColor & 0xFF00) | ((bkgColor & 0xFF0000) >> 16));

 		COLORREF gridColor = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, "hgrid", 0xFFFFFF);

-	    gridColor= (((gridColor & 0xFF) << 16) | (gridColor & 0xFF00) | ((gridColor & 0xFF0000) >> 16));

-	    if (dwFlags & MWF_LOG_INDIVIDUALBKG) {

+		gridColor= (((gridColor & 0xFF) << 16) | (gridColor & 0xFF00) | ((gridColor & 0xFF0000) >> 16));

+		if (dwFlags & MWF_LOG_INDIVIDUALBKG) {

 			inColor = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, "inbg", RGB(224,224,224));

-		    outColor = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, "outbg", RGB(224,224,224));

-		    inColor= (((inColor & 0xFF) << 16) | (inColor & 0xFF00) | ((inColor & 0xFF0000) >> 16));

-		    outColor= (((outColor & 0xFF) << 16) | (outColor & 0xFF00) | ((outColor & 0xFF0000) >> 16));

+			outColor = DBGetContactSettingDword(NULL, TABSRMM_FONTMODULE, "outbg", RGB(224,224,224));

+			inColor= (((inColor & 0xFF) << 16) | (inColor & 0xFF00) | ((inColor & 0xFF0000) >> 16));

+			outColor= (((outColor & 0xFF) << 16) | (outColor & 0xFF00) | ((outColor & 0xFF0000) >> 16));

 		} else {

 			inColor = outColor = bkgColor;

 		}

@@ -248,7 +248,7 @@ void TabSRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 			protoSettings->getSRMMFlags() & Options::LOG_IMAGE_SCROLL ? "scroll" : "fixed", (int) bkgColor, protoSettings->getSRMMBackgroundFilename());

 		} else {

 			Utils::appendText(&output, &outputSize, ".body {margin: 0px; text-align: left; background-color: #%06X; overflow: auto;}\n",

-				 	     (int) bkgColor);

+				 		 (int) bkgColor);

 		}

 		Utils::appendText(&output, &outputSize, ".link {color: #0000FF; text-decoration: underline;}\n");

 		Utils::appendText(&output, &outputSize, ".img {vertical-align: middle;}\n");

@@ -265,15 +265,15 @@ void TabSRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 			Utils::appendText(&output, &outputSize, ".divIn {padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOut {padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInGrid {padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) gridColor, (int) inColor);

+				(int) gridColor, (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutGrid {padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) gridColor, (int) outColor);

+				(int) gridColor, (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; background-color: #%06X;}\n", (int) outColor);

 			Utils::appendText(&output, &outputSize, ".divInGridRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) gridColor, (int) inColor);

+				(int) gridColor, (int) inColor);

 			Utils::appendText(&output, &outputSize, ".divOutGridRTL {text-align: right; direction:RTL; unicode-bidi:embed; padding-left: 2px; padding-right: 2px; word-wrap: break-word; border-top: 1px solid #%06X; background-color: #%06X;}\n",

-		        (int) gridColor, (int) outColor);

+				(int) gridColor, (int) outColor);

 		}

 	 	for(int i = 0; i < FONT_NUM; i++) {

 			loadMsgDlgFont(i, &lf, &color);

@@ -288,7 +288,7 @@ void TabSRMMHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) {
 		Utils::appendText(&output, &outputSize, "</style></head><body class=\"body\">\n");

 	}

 	if (output != NULL) {

-        view->write(output);

+		view->write(output);

 		free(output);

 	}

 	setLastEventType(-1);

@@ -305,11 +305,11 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 	today = today - today % 86400;

  	DWORD dwFlags = DBGetContactSettingDword(NULL, SRMSGMOD_T, "mwflags", MWF_LOG_DEFAULT);

 	DWORD dwFlags2 = DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWURLS, 0) ? MWF_SHOW_URLEVENTS : 0;

-    dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;

-    dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "in_out_icons", 0) ? MWF_SHOW_INOUTICONS : 0;

-    dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "emptylinefix", 1) ? MWF_SHOW_EMPTYLINEFIX : 0;

+	dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, SRMSGSET_SHOWFILES, 0) ? MWF_SHOW_FILEEVENTS : 0;

+	dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "in_out_icons", 0) ? MWF_SHOW_INOUTICONS : 0;

+	dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "emptylinefix", 1) ? MWF_SHOW_EMPTYLINEFIX : 0;

 	dwFlags2 |= MWF_SHOW_MICROLF;

-    dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "followupts", 1) ? MWF_SHOW_MARKFOLLOWUPTS : 0;

+	dwFlags2 |= DBGetContactSettingByte(NULL, SRMSGMOD_T, "followupts", 1) ? MWF_SHOW_MARKFOLLOWUPTS : 0;

 

 	char *szRealProto = getRealProto(event->hContact);

 	IEVIEWEVENTDATA* eventData = event->eventData;

@@ -326,19 +326,19 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			  && eventData->iType == IEED_EVENT_MESSAGE && HIWORD(getLastEventType()) == IEED_EVENT_MESSAGE

 			  && ((eventData->time < today) == (getLastEventTime() < today))

 			  && (((eventData->time < (DWORD)startedTime) == (getLastEventTime() < (DWORD)startedTime)) || !(eventData->dwFlags & IEEDF_READ))) {

-		        isGroupBreak = FALSE;

-		    }

+				isGroupBreak = FALSE;

+			}

 			char *szName = NULL;

 			char *szText = NULL;

 			if (eventData->dwFlags & IEEDF_UNICODE_NICK) {

 				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true);

    			} else {

-                szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true);

+				szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true);

 			}

 			if (eventData->dwFlags & IEEDF_UNICODE_TEXT) {

 				szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

    			} else {

-                szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

+				szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, eventData->iType == IEED_EVENT_MESSAGE ? ENF_ALL : 0, isSent);

 			}

 			/* TabSRMM-specific formatting */

 			if ((dwFlags & MWF_LOG_GRID) && isGroupBreak && getLastEventType()!=-1) {

@@ -405,7 +405,7 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			if (dwFlags & MWF_LOG_NEWLINE && eventData->iType != IEED_EVENT_STATUSCHANGE && eventData->iType != IEED_EVENT_ERRMSG && isGroupBreak) {

 				Utils::appendText(&output, &outputSize, "<br>");

 			}

-    		const char *className = "";

+			const char *className = "";

 			if (eventData->iType == IEED_EVENT_MESSAGE) {

 				if (!isHistory) className = isSent ? "messageOut" : "messageIn";

 				else className = isSent ? "hMessageOut" : "hMessageIn";

@@ -416,20 +416,20 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event
 			} else if (eventData->iType == IEED_EVENT_STATUSCHANGE) {

 				className = "statusChange";

 			}

-            Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

-            Utils::appendText(&output, &outputSize, "</div>\n");

+			Utils::appendText(&output, &outputSize, "<span class=\"%s\">%s</span>", className, szText);

+			Utils::appendText(&output, &outputSize, "</div>\n");

 			setLastEventType(MAKELONG(eventData->dwFlags, eventData->iType));

 			setLastEventTime(eventData->time);

 			if (szName!=NULL) delete szName;

 			if (szText!=NULL) delete szText;

 		}

 		if (output != NULL) {

-            view->write(output);

+			view->write(output);

 			free(output);

 		}

-    }

-    if (szRealProto!=NULL) delete szRealProto;

-    view->documentClose();

+	}

+	if (szRealProto!=NULL) delete szRealProto;

+	view->documentClose();

 //	view->scrollToBottom();

 }

 

diff --git a/IEView/TabSRMMHTMLBuilder.h b/IEView/TabSRMMHTMLBuilder.h
index bd6b82d..5132851 100644
--- a/IEView/TabSRMMHTMLBuilder.h
+++ b/IEView/TabSRMMHTMLBuilder.h
@@ -28,7 +28,7 @@ class TabSRMMHTMLBuilder;
 class TabSRMMHTMLBuilder:public TemplateHTMLBuilder

 {

 protected:

-    virtual void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

+	virtual void loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour);

 	char *timestampToString(DWORD dwFlags, time_t check, int isGroupBreak);

 	time_t 		startedTime;

 	time_t 		getStartedTime();

@@ -36,7 +36,7 @@ protected:
 	bool isDbEventShown(DBEVENTINFO * dbei);

 	void appendEventNonTemplate(IEView *, IEVIEWEVENT *event);

 public:

-    TabSRMMHTMLBuilder();

+	TabSRMMHTMLBuilder();

 	void buildHead(IEView *, IEVIEWEVENT *event);

 	void appendEvent(IEView *, IEVIEWEVENT *event);

 

diff --git a/IEView/Template.cpp b/IEView/Template.cpp
index 23e9a9c..9d6ce52 100644
--- a/IEView/Template.cpp
+++ b/IEView/Template.cpp
@@ -42,7 +42,7 @@ Token::Token(int type, const char *text, int escape) {
 	if (text!=NULL) {

 		this->text = Utils::dupString(text);

 	} else {

-        this->text = NULL;

+		this->text = NULL;

 	}

 }

 

@@ -186,13 +186,13 @@ void Template::tokenize() {
 			}

 			if (newTokenType != Token::PLAIN) {

 				if (str[i + newTokenSize] == '%') {

-                    //newTokenSize++;

+					//newTokenSize++;

 				}

 				str[i] = '\0';

 			}

 			if ((lastTokenType!=newTokenType || lastTokenEscape != newTokenEscape) && i!=lastTokenStart) {

 				if (lastTokenType == Token::PLAIN) {

-                    newToken = new Token(lastTokenType, str+lastTokenStart, lastTokenEscape);

+					newToken = new Token(lastTokenType, str+lastTokenStart, lastTokenEscape);

 				} else {

 					newToken = new Token(lastTokenType, NULL, lastTokenEscape);

 				}

@@ -344,16 +344,16 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 	char *templateText = NULL;

 	int templateTextSize = 0;

 	while (fgets(store, sizeof(store), fh) != NULL) {

-    	if (sscanf(store, "%s", tmp2) == EOF) continue;

-	    //template start

-    	bool bFound = false;

-        for (unsigned i = 0; i < sizeof(templateNames) / sizeof (templateNames[0]); i++) {

-    		if (!strncmp(store, templateNames[i].tokenString, templateNames[i].tokenLen)) {

-    			bFound = true;

-    			break;

-    		}

-    	}

-        if (bFound) {

+		if (sscanf(store, "%s", tmp2) == EOF) continue;

+		//template start

+		bool bFound = false;

+		for (unsigned i = 0; i < sizeof(templateNames) / sizeof (templateNames[0]); i++) {

+			if (!strncmp(store, templateNames[i].tokenString, templateNames[i].tokenLen)) {

+				bFound = true;

+				break;

+			}

+		}

+		if (bFound) {

 			if (wasTemplate) {

 				tmap->addTemplate(lastTemplate, templateText);

 			}

@@ -363,7 +363,7 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 			templateText = NULL;

 			templateTextSize = 0;

 			wasTemplate = true;

-            sscanf(store, "<!--%[^-]", lastTemplate);

+			sscanf(store, "<!--%[^-]", lastTemplate);

 		} else if (wasTemplate) {

 			Utils::appendText(&templateText, &templateTextSize, "%s", store);

 		}

@@ -373,9 +373,9 @@ TemplateMap* TemplateMap::loadTemplateFile(const char *id, const char *filename,
 	}

   	fclose(fh);

 	static const char *groupTemplates[] = {"MessageInGroupStart", "MessageInGroupInner",

-	                                       "hMessageInGroupStart", "hMessageInGroupInner",

+										   "hMessageInGroupStart", "hMessageInGroupInner",

 										   "MessageOutGroupStart", "MessageOutGroupInner",

-	                                       "hMessageOutGroupStart", "hMessageOutGroupInner"};

+										   "hMessageOutGroupStart", "hMessageOutGroupInner"};

 	tmap->grouping = true;

 	for (i = 0; i<SIZEOF(groupTemplates); i++) {

 		if (tmap->getTemplate(groupTemplates[i])== NULL) {

@@ -433,12 +433,12 @@ TemplateMap* TemplateMap::getTemplateMap(const char *proto) {
 }

 

 const char *TemplateMap::getFilename() {

-    return filename;

+	return filename;

 }

 

 void TemplateMap::setFilename(const char *filename) {

 	if (this->filename != NULL) {

-	    delete this->filename;

+		delete this->filename;

 	}

 	this->filename = Utils::dupString(filename);

 	Utils::convertPath(this->filename);

diff --git a/IEView/TemplateHTMLBuilder.cpp b/IEView/TemplateHTMLBuilder.cpp
index 0db3a9e..54803b0 100644
--- a/IEView/TemplateHTMLBuilder.cpp
+++ b/IEView/TemplateHTMLBuilder.cpp
@@ -126,7 +126,7 @@ char *TemplateHTMLBuilder::timestampToString(DWORD dwFlags, time_t check, int mo
 		dbtts.szFormat = (dwFlags & Options::LOG_SHOW_SECONDS) ? (char *)"s" : (char *)"t";

 		CallService(MS_DB_TIME_TIMESTAMPTOSTRING, check, (LPARAM) & dbtts);

 		strncat(szResult, str, 500);

-	} else {    //date

+	} else {//date

 		struct tm tm_now, tm_today;

 		time_t now = time(NULL);

 		time_t today;

@@ -243,7 +243,7 @@ void TemplateHTMLBuilder::buildHeadTemplate(IEView *view, IEVIEWEVENT *event, Pr
 			tokenVal = NULL;

 			switch (token->getType()) {

 				case Token::PLAIN:

-                    tokenVal = token->getText();

+					tokenVal = token->getText();

 					break;

 				case Token::BASE:

 					tokenVal = szBase;

diff --git a/IEView/TextToken.cpp b/IEView/TextToken.cpp
index 632a915..56512ac 100644
--- a/IEView/TextToken.cpp
+++ b/IEView/TextToken.cpp
@@ -105,25 +105,25 @@ const wchar_t *TextToken::getLinkW() {
 }

 

 void TextToken::setLink(const char *link) {

-    if (this->link != NULL) {

-        delete this->link;

-    }

-    if (this->wlink != NULL) {

-        delete this->wlink;

-    }

-    this->link = Utils::dupString(link);

-    this->wlink = Utils::convertToWCS(link);

+	if (this->link != NULL) {

+		delete this->link;

+	}

+	if (this->wlink != NULL) {

+		delete this->wlink;

+	}

+	this->link = Utils::dupString(link);

+	this->wlink = Utils::convertToWCS(link);

 }

 

 void TextToken::setLink(const wchar_t *link) {

-    if (this->link != NULL) {

-        delete this->link;

-    }

-    if (this->wlink != NULL) {

-        delete this->wlink;

-    }

-    this->link = Utils::convertToString(link);

-    this->wlink = Utils::dupString(link);

+	if (this->link != NULL) {

+		delete this->link;

+	}

+	if (this->wlink != NULL) {

+		delete this->wlink;

+	}

+	this->link = Utils::convertToString(link);

+	this->wlink = Utils::dupString(link);

 }

 

 static int countNoWhitespace(const wchar_t *str) {

@@ -137,13 +137,13 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text) {
 }

 

 TextToken* TextToken::tokenizeMath(const wchar_t *text) {

-   	TextToken *firstToken = NULL, *lastToken = NULL, *mathToken = NULL;

+	TextToken *firstToken = NULL, *lastToken = NULL, *mathToken = NULL;

 	static bool     mathModInitialized = false;

 	static wchar_t *mathTagName[] = {NULL, NULL};

 	static int      mathTagLen[] = {0, 0};

 	int i;

 	if (!mathModInitialized) {

-    	if (ServiceExists(MATH_GET_PARAMS)) {

+		if (ServiceExists(MATH_GET_PARAMS)) {

 			char* mthDelStart =  (char *)CallService(MATH_GET_PARAMS, (WPARAM)MATH_PARAM_STARTDELIMITER, 0);

 			char* mthDelEnd   =  (char *)CallService(MATH_GET_PARAMS, (WPARAM)MATH_PARAM_ENDDELIMITER, 0);

 			if (mthDelStart!=NULL) {

@@ -157,14 +157,14 @@ TextToken* TextToken::tokenizeMath(const wchar_t *text) {
 			CallService(MTH_FREE_MATH_BUFFER,0, (LPARAM) mthDelStart);

 			CallService(MTH_FREE_MATH_BUFFER,0, (LPARAM) mthDelEnd);

 		}

-       	mathModInitialized = true;

+		mathModInitialized = true;

 	}

-    int textLen = 0;

-    int l = (int)wcslen(text);

-    for (i=0; i<=l;) {

-        bool mathFound = false;

+	int textLen = 0;

+	int l = (int)wcslen(text);

+	for (i=0; i<=l;) {

+		bool mathFound = false;

 		int k = 0, tagDataStart=0, newTokenType = 0, newTokenSize = 0;

-    	if (mathTagName[0] != NULL && mathTagName[1] != NULL) {

+		if (mathTagName[0] != NULL && mathTagName[1] != NULL) {

 			if (!wcsnicmp(text+i, mathTagName[0], mathTagLen[0])) {

 				k = tagDataStart = i + mathTagLen[0];

 				for (; k < l; k++) {

@@ -175,7 +175,7 @@ TextToken* TextToken::tokenizeMath(const wchar_t *text) {
 					}

 				}

 			}

-    	}

+		}

 		if (mathFound) {

 			mathToken = new TextToken(MATH, text + tagDataStart, k - mathTagLen[1] - tagDataStart);

 			char* mathPath=(char*)CallService(MTH_GET_GIF_UNICODE, 0, (LPARAM) mathToken->getTextW());

@@ -199,29 +199,29 @@ TextToken* TextToken::tokenizeMath(const wchar_t *text) {
 		}

 		if (newTokenType != TEXT) {

 			if (textLen >0 ) {

-                TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

+				TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

 				textLen = 0;

 				if (lastToken == NULL) {

 					firstToken = newToken;

 				} else {

-				    lastToken->setNext(newToken);

+					lastToken->setNext(newToken);

 				}

 				lastToken = newToken;

 			}

-        	if (newTokenType == MATH) {

+			if (newTokenType == MATH) {

 				if (lastToken == NULL) {

 					firstToken = mathToken;

 				} else {

-				    lastToken->setNext(mathToken);

+					lastToken->setNext(mathToken);

 				}

 				lastToken = mathToken;

-            }

+			}

 		} else {

 			textLen += newTokenSize;

 		}

 		i += newTokenSize;

 	}

-    return firstToken;

+	return firstToken;

 }

 // TODO: Add the following BBCodes: code

 #define BB_TAG_NUM 10

@@ -233,13 +233,13 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) {
 	static int      bbTagEnd[BB_TAG_NUM];

 	static int      bbTagCount[BB_TAG_NUM];

 	int i,j;

-   	TextToken *firstToken = NULL, *lastToken = NULL, * bbToken = NULL;

-    int textLen = 0;

+	TextToken *firstToken = NULL, *lastToken = NULL, * bbToken = NULL;

+	int textLen = 0;

 	for (j = 0; j < BB_TAG_NUM; j++) {

 		bbTagCount[j] = 0;

 		bbTagEnd[j] = 0;

 	}

-    for (i = 0; i <= l;) {

+	for (i = 0; i <= l;) {

 		int k, tagArgStart=0, tagArgEnd=0, tagDataStart=0, newTokenType = 0, newTokenSize = 0;

 		bool bbFound = false;

 		if (text[i] == '[') {

@@ -280,16 +280,16 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) {
 					}

 				}

 				if (bbFound) {

-                    bbTagEnd[j] = k;

+					bbTagEnd[j] = k;

 					switch (bbTagId[j]) {

 					case BB_B:

 					case BB_I:

 					case BB_U:

-                    case BB_S:

+					case BB_S:

 					case BB_CODE:

 					case BB_COLOR:

 					case BB_SIZE:

-	                    bbTagCount[j]++;

+						bbTagCount[j]++;

 						if (bbTagArg[j]) {

 							bbToken = new TextToken(BBCODE, text + tagArgStart, tagArgEnd - tagArgStart);

 						} else {

@@ -329,7 +329,7 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) {
 					}

 				}

 				if (bbFound) {

-                    bbTagCount[j]--;

+					bbTagCount[j]--;

 					bbToken = new TextToken(BBCODE, bbTagName[j], bbTagNameLen[j]);

 					bbToken->setEnd(true);

 					bbToken->setTag(bbTagId[j]);

@@ -349,36 +349,36 @@ TextToken* TextToken::tokenizeBBCodes(const wchar_t *text, int l) {
 		}

 		if (newTokenType != TEXT) {

 			if (textLen >0 ) {

-                TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

+				TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

 				textLen = 0;

 				if (lastToken == NULL) {

 					firstToken = newToken;

 				} else {

-				    lastToken->setNext(newToken);

+					lastToken->setNext(newToken);

 				}

 				lastToken = newToken;

 			}

-            if (newTokenType == BBCODE) {

+			if (newTokenType == BBCODE) {

 				if (lastToken == NULL) {

 					firstToken = bbToken;

 				} else {

-				    lastToken->setNext(bbToken);

+					lastToken->setNext(bbToken);

 				}

 				lastToken = bbToken;

-            }

+			}

 		} else {

 			textLen += newTokenSize;

 		}

 		i += newTokenSize;

-    }

-    return firstToken;

+	}

+	return firstToken;

 }

 

 TextToken* TextToken::tokenizeLinks(const wchar_t *text) {

-    TextToken *firstToken = NULL, *lastToken = NULL;

-    int textLen = 0;

-    int l = (int)wcslen(text);

-    for (int i=0; i<=l;) {

+	TextToken *firstToken = NULL, *lastToken = NULL;

+	int textLen = 0;

+	int l = (int)wcslen(text);

+	for (int i=0; i<=l;) {

 		int newTokenType, newTokenSize;

 		int urlLen = Utils::detectURL(text+i);

 		if (i == l) {

@@ -386,53 +386,53 @@ TextToken* TextToken::tokenizeLinks(const wchar_t *text) {
 			newTokenSize = 1;

 		} else if (urlLen > 0) {

 			newTokenType = LINK;

-       		newTokenSize = urlLen;

+			newTokenSize = urlLen;

 		} else if (!wcsncmp(text+i, L"www.", 4)) {

 			newTokenType = WWWLINK;

-  			newTokenSize = countNoWhitespace(text+i);

-     	} else if (!wcsncmp(text+i, L"mailto:", 7)) {

+			newTokenSize = countNoWhitespace(text+i);

+	 	} else if (!wcsncmp(text+i, L"mailto:", 7)) {

 			newTokenType = LINK;

-            newTokenSize = countNoWhitespace(text+i);

-        } else {

+			newTokenSize = countNoWhitespace(text+i);

+		} else {

 			newTokenType = TEXT;

 			newTokenSize = 1;

 		}

 		if (newTokenType != TEXT) {

 			if (textLen >0 ) {

-                TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

+				TextToken *newToken = new TextToken(TEXT, text+i-textLen, textLen);

 				textLen = 0;

 				if (lastToken == NULL) {

 					firstToken = newToken;

 				} else {

-				    lastToken->setNext(newToken);

+					lastToken->setNext(newToken);

 				}

 				lastToken = newToken;

 			}

-            if (newTokenType == WWWLINK || newTokenType == LINK) {

-		        TextToken *newToken = new TextToken(newTokenType, text+i, newTokenSize);

-                newToken->setLink(newToken->getText());

+			if (newTokenType == WWWLINK || newTokenType == LINK) {

+				TextToken *newToken = new TextToken(newTokenType, text+i, newTokenSize);

+				newToken->setLink(newToken->getText());

 				if (lastToken == NULL) {

 					firstToken = newToken;

 				} else {

-				    lastToken->setNext(newToken);

+					lastToken->setNext(newToken);

 				}

 				lastToken = newToken;

-            }

+			}

 		} else {

 			textLen += newTokenSize;

 		}

 		i += newTokenSize;

-    }

-    return firstToken;

+	}

+	return firstToken;

 }

 

 TextToken* TextToken::tokenizeSmileys(HANDLE hContact, const char *proto, const wchar_t *text, bool isSent) {

-    TextToken *firstToken = NULL, *lastToken = NULL;

-    SMADD_BATCHPARSE2 sp;

-    SMADD_BATCHPARSERES *spRes;

-    int l = (int)wcslen(text);

+	TextToken *firstToken = NULL, *lastToken = NULL;

+	SMADD_BATCHPARSE2 sp;

+	SMADD_BATCHPARSERES *spRes;

+	int l = (int)wcslen(text);

 	if (!Options::isSmileyAdd()) {

- 		return new TextToken(TEXT, text, l);

+		return new TextToken(TEXT, text, l);

 	}

 	sp.cbSize = sizeof(sp);

 	sp.Protocolname = proto;

@@ -440,7 +440,7 @@ TextToken* TextToken::tokenizeSmileys(HANDLE hContact, const char *proto, const
 	sp.wstr = (wchar_t *)text;

 	sp.hContact = hContact;

 	spRes = (SMADD_BATCHPARSERES *) CallService(MS_SMILEYADD_BATCHPARSE, 0, (LPARAM)&sp);

-    int last_pos = 0;

+	int last_pos = 0;

 	if (spRes != NULL) {

 		for (int i = 0; i < (int)sp.numSmileys; i++) {

 			if (spRes[i].filepath != NULL && strlen((char *)spRes[i].filepath) > 0) {

@@ -471,23 +471,23 @@ TextToken* TextToken::tokenizeSmileys(HANDLE hContact, const char *proto, const
 		CallService(MS_SMILEYADD_BATCHFREE, 0, (LPARAM)spRes);

 	}

 	if (last_pos < l)  {

-        TextToken *newToken = new TextToken(TEXT, text+last_pos, l-last_pos);

+		TextToken *newToken = new TextToken(TEXT, text+last_pos, l-last_pos);

 		if (lastToken == NULL) {

 			firstToken = newToken;

 		} else {

-		    lastToken->setNext(newToken);

+			lastToken->setNext(newToken);

 		}

 		lastToken = newToken;

 	}

-    return firstToken;

+	return firstToken;

 }

 

 TextToken* TextToken::tokenizeChatFormatting(const wchar_t *text) {

-    TextToken *firstToken = NULL, *lastToken = NULL;

-    int textLen = 0;

-    int l = (int)wcslen(text);

-    wchar_t* tokenBuffer = new wchar_t[l + 1];

-    for (int i=0; i<=l;) {

+	TextToken *firstToken = NULL, *lastToken = NULL;

+	int textLen = 0;

+	int l = (int)wcslen(text);

+	wchar_t* tokenBuffer = new wchar_t[l + 1];

+	for (int i=0; i<=l;) {

 		int newTokenType = TEXT;

 		int newTokenSize = 1;

 		int newTokenTag = 0;

@@ -577,67 +577,67 @@ TextToken* TextToken::tokenizeChatFormatting(const wchar_t *text) {
 		}

 		i += newTokenSize;

 	}

-    return firstToken;

+	return firstToken;

 }

 

 wchar_t *TextToken::htmlEncode(const wchar_t *str) {

-    wchar_t *out;

-    const wchar_t *ptr;

-    bool wasSpace;

-    int c;

-    c = 0;

-    wasSpace = false;

-    for (ptr=str; *ptr!='\0'; ptr++) {

-    	if (*ptr==' ' && wasSpace) {

-   			wasSpace = true;

-   		 	c += 6;

-   		} else {

-   		    wasSpace = false;

-        	switch (*ptr) {

-        		case '\n': c += 4; break;

-    			case '\r': break;

-        		case '&': c += 5; break;

-        		case '>': c += 4; break;

-        		case '<': c += 4; break;

-        		case '"': c += 6; break;

-    			case ' ': wasSpace = true;

-        		default: c += 1; break;

-        	}

-      	}

-    }

-    wchar_t *output = new wchar_t[c+1];

-    wasSpace = false;

-    for (out=output, ptr=str; *ptr!='\0'; ptr++) {

-    	if (*ptr==' ' && wasSpace) {

-	      	wcscpy(out, L"&nbsp;");

-    		out += 6;

-   		} else {

-   		    wasSpace = false;

-        	switch (*ptr) {

-    			case '\n': wcscpy(out, L"<br>"); out += 4; break;

-    			case '\r': break;

-    			case '&': wcscpy(out, L"&amp;"); out += 5; break;

-    			case '>': wcscpy(out, L"&gt;"); out += 4; break;

-    			case '<': wcscpy(out, L"&lt;"); out += 4; break;

-    			case '"': wcscpy(out, L"&quot;"); out += 6; break;

-    			case ' ': wasSpace = true;

-        		default: *out = *ptr; out += 1; break;

-        	}

-         }

-    }

-    *out  = '\0';

-    return output;

+	wchar_t *out;

+	const wchar_t *ptr;

+	bool wasSpace;

+	int c;

+	c = 0;

+	wasSpace = false;

+	for (ptr=str; *ptr!='\0'; ptr++) {

+		if (*ptr==' ' && wasSpace) {

+			wasSpace = true;

+			c += 6;

+		} else {

+			wasSpace = false;

+			switch (*ptr) {

+				case '\n': c += 4; break;

+				case '\r': break;

+				case '&': c += 5; break;

+				case '>': c += 4; break;

+				case '<': c += 4; break;

+				case '"': c += 6; break;

+				case ' ': wasSpace = true;

+				default: c += 1; break;

+			}

+		}

+	}

+	wchar_t *output = new wchar_t[c+1];

+	wasSpace = false;

+	for (out=output, ptr=str; *ptr!='\0'; ptr++) {

+		if (*ptr==' ' && wasSpace) {

+			wcscpy(out, L"&nbsp;");

+			out += 6;

+		} else {

+			wasSpace = false;

+			switch (*ptr) {

+				case '\n': wcscpy(out, L"<br>"); out += 4; break;

+				case '\r': break;

+				case '&': wcscpy(out, L"&amp;"); out += 5; break;

+				case '>': wcscpy(out, L"&gt;"); out += 4; break;

+				case '<': wcscpy(out, L"&lt;"); out += 4; break;

+				case '"': wcscpy(out, L"&quot;"); out += 6; break;

+				case ' ': wasSpace = true;

+				default: *out = *ptr; out += 1; break;

+			}

+		}

+	}

+	*out  = '\0';

+	return output;

 }

 

 void TextToken::toString(wchar_t **str, int *sizeAlloced) {

-    wchar_t *eText = NULL, *eLink = NULL;

-    switch (type) {

-        case TEXT:

-            eText = htmlEncode(wtext);

-            Utils::appendText(str, sizeAlloced, L"%s", eText);

-            break;

-        case WWWLINK:

-        case LINK:

+	wchar_t *eText = NULL, *eLink = NULL;

+	switch (type) {

+		case TEXT:

+			eText = htmlEncode(wtext);

+			Utils::appendText(str, sizeAlloced, L"%s", eText);

+			break;

+		case WWWLINK:

+		case LINK:

 			{

 				eText = htmlEncode(wtext);

 				eLink = htmlEncode(wlink);

@@ -688,30 +688,30 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
 				}

 				Utils::appendText(str, sizeAlloced, L"<a class=\"link\" target=\"_self\" href=\"%s%s\">%s</a>", linkPrefix, eLink, eText);

 			}

-            break;

-        case SMILEY:

-            eText = htmlEncode(wtext);

-            if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(wlink, L".swf")!=NULL)) {

-                Utils::appendText(str, sizeAlloced,

+			break;

+		case SMILEY:

+			eText = htmlEncode(wtext);

+			if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(wlink, L".swf")!=NULL)) {

+				Utils::appendText(str, sizeAlloced,

 		L"<span title=\"%s\" class=\"img\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \

 		codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" >\

 		<param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></span><span style=\"position:absolute; visibility:hidden;\">%s</span>",

-            	wlink, eText);

+				wlink, eText);

 			} else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png")!=NULL)) {

-	           	Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" alt=\"%s\"/><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);

+				Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" alt=\"%s\"/><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);

 			} else {

-	           	Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);

+				Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);

 			}

-            break;

-        case MATH:

-            eText = htmlEncode(wtext);

+			break;

+		case MATH:

+			eText = htmlEncode(wtext);

 			if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(wlink, L".png")!=NULL)) {

-			    Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\"  alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>",wlink , eText, eText);

+				Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\"  alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>",wlink , eText, eText);

 			} else {

 				Utils::appendText(str, sizeAlloced, L"<img class=\"img\" src=\"file://%s\" alt=\"%s\" /><span style=\"position:absolute; visibility:hidden;\">%s</span>", wlink, eText, eText);

 			}

-            break;

-        case BBCODE:

+			break;

+		case BBCODE:

 			if (!end) {

 				switch (tag) {

 				case BB_B:

@@ -735,15 +735,15 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
 					Utils::appendText(str, sizeAlloced, L"<pre class=\"code\">");

 					break;

 				case BB_IMG:

-            		eText = htmlEncode(wtext);

-		            if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf")!=NULL)) {

-        		    	Utils::appendText(str, sizeAlloced,

+					eText = htmlEncode(wtext);

+					if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf")!=NULL)) {

+						Utils::appendText(str, sizeAlloced,

 		L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \

 		codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\

 		<param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",

 						eText);

 					} else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(eText, L".png")!=NULL)) {

-			           	Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);

+						Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);

 					} else {

 						if (wcsncmp(eText, L"http://", 7)) {

 							Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);

@@ -751,43 +751,43 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
 							Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"%s\" /></div>", eText);

 						}

 					}

-        	    	break;

+					break;

 				case BB_BIMG:

 					{

 						wchar_t *absolutePath = Utils::toAbsolute(wtext);

-	            		eText = htmlEncode(absolutePath);

+						eText = htmlEncode(absolutePath);

 						delete absolutePath;

 					}

-		            if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf")!=NULL)) {

-        		    	Utils::appendText(str, sizeAlloced,

+					if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_FLASH) && (wcsstr(eText, L".swf")!=NULL)) {

+						Utils::appendText(str, sizeAlloced,

 		L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><object classid=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\" \

 		codebase=\"http://active.macromedia.com/flash2/cabs/swflash.cab#version=4,0,0,0\" width=\"100%%\" >\

 		<param NAME=\"movie\" VALUE=\"%s\"><param NAME=\"quality\" VALUE=\"high\"><PARAM NAME=\"loop\" VALUE=\"true\"></object></div>",

 						eText);

 					} else if ((Options::getGeneralFlags()&Options::GENERAL_ENABLE_PNGHACK) && (wcsstr(eText, L".png")!=NULL)) {

-			           	Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);

+						Utils::appendText(str, sizeAlloced, L"<img class=\"img\" style=\"height:1px;width:1px;filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='%s',sizingMethod='image');\" />", eText);

 					} else {

-        		    	Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);

+						Utils::appendText(str, sizeAlloced, L"<div style=\"width: 100%%; border: 0; overflow: hidden;\"><img class=\"img\" style=\"width: expression((maxw = this.parentNode.offsetWidth ) > this.width ? 'auto' : maxw);\" src=\"file://%s\" /></div>", eText);

 					}

-        	    	break;

+					break;

 				case BB_URL:

 					eText = htmlEncode(wtext);

 					eLink = htmlEncode(wlink);

-        	    	Utils::appendText(str, sizeAlloced, L"<a href =\"%s\">%s</a>", eLink, eText);

-        	    	break;

+					Utils::appendText(str, sizeAlloced, L"<a href =\"%s\">%s</a>", eLink, eText);

+					break;

 				case BB_COLOR:

-            		eText = htmlEncode(wtext);

-        	    	//Utils::appendText(str, sizeAlloced, L"<span style=\"color: %s;\">", eText);

-        	    	Utils::appendText(str, sizeAlloced, L"<font color =\"%s\">", eText);

-        	    	break;

+					eText = htmlEncode(wtext);

+					//Utils::appendText(str, sizeAlloced, L"<span style=\"color: %s;\">", eText);

+					Utils::appendText(str, sizeAlloced, L"<font color =\"%s\">", eText);

+					break;

 				case BB_BACKGROUND:

-            		eText = htmlEncode(wtext);

-        	    	Utils::appendText(str, sizeAlloced, L"<span style=\"background: %s;\">", eText);

-        	    	break;

+					eText = htmlEncode(wtext);

+					Utils::appendText(str, sizeAlloced, L"<span style=\"background: %s;\">", eText);

+					break;

 				case BB_SIZE:

-            		eText = htmlEncode(wtext);

-        	    	Utils::appendText(str, sizeAlloced, L"<span style=\"font-size: %s;\">", eText);

-        	    	break;

+					eText = htmlEncode(wtext);

+					Utils::appendText(str, sizeAlloced, L"<span style=\"font-size: %s;\">", eText);

+					break;

 				}

 			} else {

 				switch (tag) {

@@ -818,7 +818,7 @@ void TextToken::toString(wchar_t **str, int *sizeAlloced) {
 				}

 			}

 			break;

-    }

-    if (eText!=NULL) delete eText;

-    if (eLink!=NULL) delete eLink;

+	}

+	if (eText!=NULL) delete eText;

+	if (eLink!=NULL) delete eLink;

 }

diff --git a/IEView/Utils.cpp b/IEView/Utils.cpp
index cde3414..de2d026 100644
--- a/IEView/Utils.cpp
+++ b/IEView/Utils.cpp
@@ -221,7 +221,7 @@ void Utils::convertPath(wchar_t *path) {
 }

 

 DWORD Utils::safe_wcslen(wchar_t *msg, DWORD maxLen) {

-    DWORD i;

+	DWORD i;

 	for (i = 0; i < maxLen; i++) {

 		if (msg[i] == (wchar_t)0)

 			return i;

diff --git a/IEView/ieview_main.cpp b/IEView/ieview_main.cpp
index ecde73e..402f656 100644
--- a/IEView/ieview_main.cpp
+++ b/IEView/ieview_main.cpp
@@ -34,7 +34,7 @@ static int PreShutdown(WPARAM wParam, LPARAM lParam);
 int hLangpack;

 

 PLUGININFOEX pluginInfoEx = {

-    sizeof(PLUGININFOEX),

+	sizeof(PLUGININFOEX),

 	__PLUGIN_NAME,

 	PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),

 	__DESCRIPTION,

@@ -44,7 +44,7 @@ PLUGININFOEX pluginInfoEx = {
 	__AUTHORWEB,

 	UNICODE_AWARE,

 	0,

-	{0x0495171b,   0x7137,   0x4ded,    {0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91}}

+	{0x0495171b,   0x7137,   0x4ded, {0x97, 0xf8, 0xce, 0x6f, 0xed, 0x67, 0xd6, 0x91}}

 };

 

 extern "C" BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpvReserved)