2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp
index add6cd23ae..d8b4467215 100755
--- a/plugins/New_GPG/src/messages.cpp
+++ b/plugins/New_GPG/src/messages.cpp
@@ -956,7 +956,7 @@ int HookSendMsg(WPARAM w, LPARAM l)
 			str_event.insert(0, toUTF8(outopentag));
 			str_event.append(toUTF8(outclosetag));
 			dbei->pBlob = (PBYTE)mir_strdup(str_event.c_str());
-			dbei->cbBlob = str_event.length() + 1;
+			dbei->cbBlob = (DWORD)str_event.length() + 1;
 		}
 
 		return 0;
diff --git a/plugins/New_GPG/src/metacontacts.cpp b/plugins/New_GPG/src/metacontacts.cpp
index ab3c60bce5..b466cc65f0 100644
--- a/plugins/New_GPG/src/metacontacts.cpp
+++ b/plugins/New_GPG/src/metacontacts.cpp
@@ -29,16 +29,13 @@ bool metaIsProtoMetaContacts(HANDLE hContact)
     return false;
 }
 
-
 bool metaIsDefaultSubContact(HANDLE hContact) 
 {
-
     if(bMetaContacts)
 		return (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0),0)==hContact;
     return false;
 }
 
-
 HANDLE metaGetContact(HANDLE hContact) 
 {
     if(bMetaContacts)
@@ -46,14 +43,14 @@ HANDLE metaGetContact(HANDLE hContact)
 			return (HANDLE)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0);
     return NULL;
 }
+
 bool metaIsSubcontact(HANDLE hContact)
 {
 	if(bMetaContacts)
-		return (HANDLE)CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0);
+		return CallService(MS_MC_GETMETACONTACT,(WPARAM)hContact,0) != 0;
     return false;
 }
 
-
 HANDLE metaGetMostOnline(HANDLE hContact) 
 {
 
@@ -62,6 +59,7 @@ HANDLE metaGetMostOnline(HANDLE hContact)
 			return (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hContact,0);
     return NULL;
 }
+
 HANDLE metaGetDefault(HANDLE hContact) 
 {
 
@@ -71,13 +69,13 @@ HANDLE metaGetDefault(HANDLE hContact)
     return NULL;
 }
 
-
 DWORD metaGetContactsNum(HANDLE hContact)
 {
 	if(bMetaContacts)
 		return CallService(MS_MC_GETNUMCONTACTS, (WPARAM)hContact, 0);
 	return 0;
 }
+
 HANDLE metaGetSubcontact(HANDLE hContact, int num)
 {
 	if(bMetaContacts)