36 files changed, 0 insertions, 11007 deletions
diff --git a/plugins/new_gpg/Makefile b/plugins/new_gpg/Makefile
deleted file mode 100755
index 183390389b..0000000000
--- a/plugins/new_gpg/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CFLAGS=-g  -mdll -mwindows -I../miranda-im/miranda/include -I./ -I/home/sss/temp/windows/libs/utf8cpp/include -D DEBUG -D _UNICODE -D UNICODE -DBOOST_SYSTEM_STATIC_LINK=1 -DBOOST_THREAD_USE_LIB
-CXXFLAGS=${CFLAGS}
-LDFLAGS=-static-libgcc -Wl,-O1 -shared -s -Wl,--subsystem,windows,--kill-at -lshlwapi -lcomdlg32 -lboost_system-mt -lboost_thread_win32-mt -lboost_random-mt -lboost_date_time-mt
-CPPFLAGS =
-CC=i686-pc-mingw32-gcc
-CXX=i686-pc-mingw32-g++
-STRIP=i686-pc-mingw32-strip
-LD=i686-pc-mingw32-ld
-LNK_COMMON=-lkernel32
-
-MAINOBJS=jabber_account.o clist.o init.o options.o gpg_wrapper.o srmm.o messages.o utilities.o metacontacts.o main.o log.o icons.o
-
-WINDRES=i686-pc-mingw32-windres
-
-all: main
-main: $(MAINOBJS)
-	$(WINDRES) -i new_gpg.rc -o resources.o
-	$(CXX) $(MAINOBJS) resources.o $(LNK_COMMON) $(LDFLAGS) -o new_gpg.dll
-	$(STRIP) new_gpg.dll
-	upx --best --compress-icons=0 new_gpg.dll
-clean:
-	rm *.o
-	rm new_gpg.dll
diff --git a/plugins/new_gpg/README b/plugins/new_gpg/README
deleted file mode 100755
index be5551c7ac..0000000000
--- a/plugins/new_gpg/README
+++ /dev/null
@@ -1,6 +0,0 @@
-* Build Dependencies
-    1. boost (http://www.boost.org/)
-    2. utf8cpp (http://utfcpp.sourceforge.net/)
-    3. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) ))
-* Runtime Dependencies
-    1. MIranda NG
diff --git a/plugins/new_gpg/dependencies/include/utf8.h b/plugins/new_gpg/dependencies/include/utf8.h
deleted file mode 100755
index 4e4451403f..0000000000
--- a/plugins/new_gpg/dependencies/include/utf8.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "utf8/checked.h"
-#include "utf8/unchecked.h"
-
-#endif // header guard
diff --git a/plugins/new_gpg/dependencies/include/utf8/checked.h b/plugins/new_gpg/dependencies/include/utf8/checked.h
deleted file mode 100755
index 3b00644444..0000000000
--- a/plugins/new_gpg/dependencies/include/utf8/checked.h
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "core.h"
-#include <stdexcept>
-
-namespace utf8
-{
-    // Base for the exceptions that may be thrown from the library
-    class exception : public ::std::exception {
-    };
-
-    // Exceptions that may be thrown from the library functions.
-    class invalid_code_point : public exception {
-        uint32_t cp;
-    public:
-        invalid_code_point(uint32_t cp) : cp(cp) {}
-        virtual const char* what() const throw() { return "Invalid code point"; }
-        uint32_t code_point() const {return cp;}
-    };
-
-    class invalid_utf8 : public exception {
-        uint8_t u8;
-    public:
-        invalid_utf8 (uint8_t u) : u8(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-8"; }
-        uint8_t utf8_octet() const {return u8;}
-    };
-
-    class invalid_utf16 : public exception {
-        uint16_t u16;
-    public:
-        invalid_utf16 (uint16_t u) : u16(u) {}
-        virtual const char* what() const throw() { return "Invalid UTF-16"; }
-        uint16_t utf16_word() const {return u16;}
-    };
-
-    class not_enough_room : public exception {
-    public:
-        virtual const char* what() const throw() { return "Not enough space"; }
-    };
-
-    /// The library API - functions intended to be called by the users
-
-    template <typename octet_iterator>
-    octet_iterator append(uint32_t cp, octet_iterator result)
-    {
-        if (!utf8::internal::is_code_point_valid(cp))
-            throw invalid_code_point(cp);
-
-        if (cp < 0x80)                        // one octet
-            *(result++) = static_cast<uint8_t>(cp);
-        else if (cp < 0x800) {                // two octets
-            *(result++) = static_cast<uint8_t>((cp >> 6)            | 0xc0);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else if (cp < 0x10000) {              // three octets
-            *(result++) = static_cast<uint8_t>((cp >> 12)           | 0xe0);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        else {                                // four octets
-            *(result++) = static_cast<uint8_t>((cp >> 18)           | 0xf0);
-            *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)  | 0x80);
-            *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f)   | 0x80);
-            *(result++) = static_cast<uint8_t>((cp & 0x3f)          | 0x80);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out, uint32_t replacement)
-    {
-        while (start != end) {
-            octet_iterator sequence_start = start;
-            internal::utf_error err_code = utf8::internal::validate_next(start, end);
-            switch (err_code) {
-                case internal::UTF8_OK :
-                    for (octet_iterator it = sequence_start; it != start; ++it)
-                        *out++ = *it;
-                    break;
-                case internal::NOT_ENOUGH_ROOM:
-                    throw not_enough_room();
-                case internal::INVALID_LEAD:
-                    utf8::append (replacement, out);
-                    ++start;
-                    break;
-                case internal::INCOMPLETE_SEQUENCE:
-                case internal::OVERLONG_SEQUENCE:
-                case internal::INVALID_CODE_POINT:
-                    utf8::append (replacement, out);
-                    ++start;
-                    // just one replacement mark for the sequence
-                    while (start != end && utf8::internal::is_trail(*start))
-                        ++start;
-                    break;
-            }
-        }
-        return out;
-    }
-
-    template <typename octet_iterator, typename output_iterator>
-    inline output_iterator replace_invalid(octet_iterator start, octet_iterator end, output_iterator out)
-    {
-        static const uint32_t replacement_marker = utf8::internal::mask16(0xfffd);
-        return utf8::replace_invalid(start, end, out, replacement_marker);
-    }
-
-    template <typename octet_iterator>
-    uint32_t next(octet_iterator& it, octet_iterator end)
-    {
-        uint32_t cp = 0;
-        internal::utf_error err_code = utf8::internal::validate_next(it, end, cp);
-        switch (err_code) {
-            case internal::UTF8_OK :
-                break;
-            case internal::NOT_ENOUGH_ROOM :
-                throw not_enough_room();
-            case internal::INVALID_LEAD :
-            case internal::INCOMPLETE_SEQUENCE :
-            case internal::OVERLONG_SEQUENCE :
-                throw invalid_utf8(*it);
-            case internal::INVALID_CODE_POINT :
-                throw invalid_code_point(cp);
-        }
-        return cp;
-    }
-
-    template <typename octet_iterator>
-    uint32_t peek_next(octet_iterator it, octet_iterator end)
-    {
-        return utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    uint32_t prior(octet_iterator& it, octet_iterator start)
-    {
-        // can't do much if it == start
-        if (it == start)
-            throw not_enough_room();
-
-        octet_iterator end = it;
-        // Go back until we hit either a lead octet or start
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        return utf8::peek_next(it, end);
-    }
-
-    /// Deprecated in versions that include "prior"
-    template <typename octet_iterator>
-    uint32_t previous(octet_iterator& it, octet_iterator pass_start)
-    {
-        octet_iterator end = it;
-        while (utf8::internal::is_trail(*(--it)))
-            if (it == pass_start)
-                throw invalid_utf8(*it); // error - no lead byte in the sequence
-        octet_iterator temp = it;
-        return utf8::next(temp, end);
-    }
-
-    template <typename octet_iterator, typename distance_type>
-    void advance (octet_iterator& it, distance_type n, octet_iterator end)
-    {
-        for (distance_type i = 0; i < n; ++i)
-            utf8::next(it, end);
-    }
-
-    template <typename octet_iterator>
-    typename std::iterator_traits<octet_iterator>::difference_type
-    distance (octet_iterator first, octet_iterator last)
-    {
-        typename std::iterator_traits<octet_iterator>::difference_type dist;
-        for (dist = 0; first < last; ++dist)
-            utf8::next(first, last);
-        return dist;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-    {
-        while (start != end) {
-            uint32_t cp = utf8::internal::mask16(*start++);
-            // Take care of surrogate pairs first
-            if (utf8::internal::is_lead_surrogate(cp)) {
-                if (start != end) {
-                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
-                    if (utf8::internal::is_trail_surrogate(trail_surrogate))
-                        cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
-                    else
-                        throw invalid_utf16(static_cast<uint16_t>(trail_surrogate));
-                }
-                else
-                    throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            }
-            // Lone trail surrogate
-            else if (utf8::internal::is_trail_surrogate(cp))
-                throw invalid_utf16(static_cast<uint16_t>(cp));
-
-            result = utf8::append(cp, result);
-        }
-        return result;
-    }
-
-    template <typename u16bit_iterator, typename octet_iterator>
-    u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
-    {
-        while (start != end) {
-            uint32_t cp = utf8::next(start, end);
-            if (cp > 0xffff) { //make a surrogate pair
-                *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
-                *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
-            }
-            else
-                *result++ = static_cast<uint16_t>(cp);
-        }
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
-    {
-        while (start != end)
-            result = utf8::append(*(start++), result);
-
-        return result;
-    }
-
-    template <typename octet_iterator, typename u32bit_iterator>
-    u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
-    {
-        while (start != end)
-            (*result++) = utf8::next(start, end);
-
-        return result;
-    }
-
-    // The iterator class
-    template <typename octet_iterator>
-    class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> {
-      octet_iterator it;
-      octet_iterator range_start;
-      octet_iterator range_end;
-      public:
-      iterator () {};
-      explicit iterator (const octet_iterator& octet_it,
-                         const octet_iterator& range_start,
-                         const octet_iterator& range_end) :
-               it(octet_it), range_start(range_start), range_end(range_end)
-      {
-          if (it < range_start || it > range_end)
-              throw std::out_of_range("Invalid utf-8 iterator position");
-      }
-      // the default "big three" are OK
-      octet_iterator base () const { return it; }
-      uint32_t operator * () const
-      {
-          octet_iterator temp = it;
-          return utf8::next(temp, range_end);
-      }
-      bool operator == (const iterator& rhs) const
-      {
-          if (range_start != rhs.range_start || range_end != rhs.range_end)
-              throw std::logic_error("Comparing utf-8 iterators defined with different ranges");
-          return (it == rhs.it);
-      }
-      bool operator != (const iterator& rhs) const
-      {
-          return !(operator == (rhs));
-      }
-      iterator& operator ++ ()
-      {
-          utf8::next(it, range_end);
-          return *this;
-      }
-      iterator operator ++ (int)
-      {
-          iterator temp = *this;
-          utf8::next(it, range_end);
-          return temp;
-      }
-      iterator& operator -- ()
-      {
-          utf8::prior(it, range_start);
-          return *this;
-      }
-      iterator operator -- (int)
-      {
-          iterator temp = *this;
-          utf8::prior(it, range_start);
-          return temp;
-      }
-    }; // class iterator
-
-} // namespace utf8
-
-#endif //header guard
-
-
diff --git a/plugins/new_gpg/dependencies/include/utf8/core.h b/plugins/new_gpg/dependencies/include/utf8/core.h
deleted file mode 100755
index 693d388c07..0000000000
--- a/plugins/new_gpg/dependencies/include/utf8/core.h
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_CORE_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include <iterator>
-
-namespace utf8
-{
-    // The typedefs for 8-bit, 16-bit and 32-bit unsigned integers
-    // You may need to change them to match your system.
-    // These typedefs have the same names as ones from cstdint, or boost/cstdint
-    typedef unsigned char   uint8_t;
-    typedef unsigned short  uint16_t;
-    typedef unsigned int    uint32_t;
-
-// Helper code - not intended to be directly called by the library users. May be changed at any time
-namespace internal
-{
-    // Unicode constants
-    // Leading (high) surrogates: 0xd800 - 0xdbff
-    // Trailing (low) surrogates: 0xdc00 - 0xdfff
-    const uint16_t LEAD_SURROGATE_MIN  = 0xd800u;
-    const uint16_t LEAD_SURROGATE_MAX  = 0xdbffu;
-    const uint16_t TRAIL_SURROGATE_MIN = 0xdc00u;
-    const uint16_t TRAIL_SURROGATE_MAX = 0xdfffu;
-    const uint16_t LEAD_OFFSET         = LEAD_SURROGATE_MIN - (0x10000 >> 10);
-    const uint32_t SURROGATE_OFFSET    = 0x10000u - (LEAD_SURROGATE_MIN << 10) - TRAIL_SURROGATE_MIN;
-
-    // Maximum valid value for a Unicode code point
-    const uint32_t CODE_POINT_MAX      = 0x0010ffffu;
-
-    template<typename octet_type>
-    inline uint8_t mask8(octet_type oc)
-    {
-        return static_cast<uint8_t>(0xff & oc);
-    }
-    template<typename u16_type>
-    inline uint16_t mask16(u16_type oc)
-    {
-        return static_cast<uint16_t>(0xffff & oc);
-    }
-    template<typename octet_type>
-    inline bool is_trail(octet_type oc)
-    {
-        return ((utf8::internal::mask8(oc) >> 6) == 0x2);
-    }
-
-    template <typename u16>
-    inline bool is_lead_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= LEAD_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_trail_surrogate(u16 cp)
-    {
-        return (cp >= TRAIL_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u16>
-    inline bool is_surrogate(u16 cp)
-    {
-        return (cp >= LEAD_SURROGATE_MIN && cp <= TRAIL_SURROGATE_MAX);
-    }
-
-    template <typename u32>
-    inline bool is_code_point_valid(u32 cp)
-    {
-        return (cp <= CODE_POINT_MAX && !utf8::internal::is_surrogate(cp));
-    }
-
-    template <typename octet_iterator>
-    inline typename std::iterator_traits<octet_iterator>::difference_type
-    sequence_length(octet_iterator lead_it)
-    {
-        uint8_t lead = utf8::internal::mask8(*lead_it);
-        if (lead < 0x80)
-            return 1;
-        else if ((lead >> 5) == 0x6)
-            return 2;
-        else if ((lead >> 4) == 0xe)
-            return 3;
-        else if ((lead >> 3) == 0x1e)
-            return 4;
-        else
-            return 0;
-    }
-
-    template <typename octet_difference_type>
-    inline bool is_overlong_sequence(uint32_t cp, octet_difference_type length)
-    {
-        if (cp < 0x80) {
-            if (length != 1) 
-                return true;
-        }
-        else if (cp < 0x800) {
-            if (length != 2) 
-                return true;
-        }
-        else if (cp < 0x10000) {
-            if (length != 3) 
-                return true;
-        }
-
-        return false;
-    }
-
-    enum utf_error {UTF8_OK, NOT_ENOUGH_ROOM, INVALID_LEAD, INCOMPLETE_SEQUENCE, OVERLONG_SEQUENCE, INVALID_CODE_POINT};
-
-    /// Helper for get_sequence_x
-    template <typename octet_iterator>
-    utf_error increase_safely(octet_iterator& it, octet_iterator end)
-    {
-        if (++it == end)
-            return NOT_ENOUGH_ROOM;
-
-        if (!utf8::internal::is_trail(*it))
-            return INCOMPLETE_SEQUENCE;
-        
-        return UTF8_OK;
-    }
-
-    #define UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(IT, END) {utf_error ret = increase_safely(IT, END); if (ret != UTF8_OK) return ret;}    
-
-    /// get_sequence_x functions decode utf-8 sequences of the length x
-    template <typename octet_iterator>
-    utf_error get_sequence_1(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_2(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end) 
-            return NOT_ENOUGH_ROOM;
-        
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 6) & 0x7ff) + ((*it) & 0x3f);
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_3(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-            return NOT_ENOUGH_ROOM;
-            
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    template <typename octet_iterator>
-    utf_error get_sequence_4(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        if (it == end)
-           return NOT_ENOUGH_ROOM;
-
-        code_point = utf8::internal::mask8(*it);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point = ((code_point << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (utf8::internal::mask8(*it) << 6) & 0xfff;
-
-        UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR(it, end)
-
-        code_point += (*it) & 0x3f;
-
-        return UTF8_OK;
-    }
-
-    #undef UTF8_CPP_INCREASE_AND_RETURN_ON_ERROR
-
-    template <typename octet_iterator>
-    utf_error validate_next(octet_iterator& it, octet_iterator end, uint32_t& code_point)
-    {
-        // Save the original value of it so we can go back in case of failure
-        // Of course, it does not make much sense with i.e. stream iterators
-        octet_iterator original_it = it;
-
-        uint32_t cp = 0;
-        // Determine the sequence length based on the lead octet
-        typedef typename std::iterator_traits<octet_iterator>::difference_type octet_difference_type;
-        const octet_difference_type length = utf8::internal::sequence_length(it);
-
-        // Get trail octets and calculate the code point
-        utf_error err = UTF8_OK;
-        switch (length) {
-            case 0: 
-                return INVALID_LEAD;
-            case 1:
-                err = utf8::internal::get_sequence_1(it, end, cp);
-                break;
-            case 2:
-                err = utf8::internal::get_sequence_2(it, end, cp);
-            break;
-            case 3:
-                err = utf8::internal::get_sequence_3(it, end, cp);
-            break;
-            case 4:
-                err = utf8::internal::get_sequence_4(it, end, cp);
-            break;
-        }
-
-        if (err == UTF8_OK) {
-            // Decoding succeeded. Now, security checks...
-            if (utf8::internal::is_code_point_valid(cp)) {
-                if (!utf8::internal::is_overlong_sequence(cp, length)){
-                    // Passed! Return here.
-                    code_point = cp;
-                    ++it;
-                    return UTF8_OK;
-                }
-                else
-                    err = OVERLONG_SEQUENCE;
-            }
-            else 
-                err = INVALID_CODE_POINT;
-        }
-
-        // Failure branch - restore the original value of the iterator
-        it = original_it;
-        return err;
-    }
-
-    template <typename octet_iterator>
-    inline utf_error validate_next(octet_iterator& it, octet_iterator end) {
-        uint32_t ignored;
-        return utf8::internal::validate_next(it, end, ignored);
-    }
-
-} // namespace internal
-
-    /// The library API - functions intended to be called by the users
-
-    // Byte order mark
-    const uint8_t bom[] = {0xef, 0xbb, 0xbf};
-
-    template <typename octet_iterator>
-    octet_iterator find_invalid(octet_iterator start, octet_iterator end)
-    {
-        octet_iterator result = start;
-        while (result != end) {
-            utf8::internal::utf_error err_code = utf8::internal::validate_next(result, end);
-            if (err_code != internal::UTF8_OK)
-                return result;
-        }
-        return result;
-    }
-
-    template <typename octet_iterator>
-    inline bool is_valid(octet_iterator start, octet_iterator end)
-    {
-        return (utf8::find_invalid(start, end) == end);
-    }
-
-    template <typename octet_iterator>
-    inline bool starts_with_bom (octet_iterator it, octet_iterator end)
-    {
-        return (
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[0]) &&
-            ((it != end) && (utf8::internal::mask8(*it++)) == bom[1]) &&
-            ((it != end) && (utf8::internal::mask8(*it))   == bom[2])
-           );
-    }
-	
-    //Deprecated in release 2.3 
-    template <typename octet_iterator>
-    inline bool is_bom (octet_iterator it)
-    {
-        return (
-            (utf8::internal::mask8(*it++)) == bom[0] &&
-            (utf8::internal::mask8(*it++)) == bom[1] &&
-            (utf8::internal::mask8(*it))   == bom[2]
-           );
-    }
-} // namespace utf8
-
-#endif // header guard
-
-
diff --git a/plugins/new_gpg/dependencies/include/utf8/unchecked.h b/plugins/new_gpg/dependencies/include/utf8/unchecked.h
deleted file mode 100755
index b4547fad94..0000000000
--- a/plugins/new_gpg/dependencies/include/utf8/unchecked.h
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2006 Nemanja Trifunovic
-
-/*
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-*/
-
-
-#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
-
-#include "core.h"
-
-namespace utf8
-{
-    namespace unchecked 
-    {
-        template <typename octet_iterator>
-        octet_iterator append(uint32_t cp, octet_iterator result)
-        {
-            if (cp < 0x80)                        // one octet
-                *(result++) = static_cast<uint8_t>(cp);  
-            else if (cp < 0x800) {                // two octets
-                *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            else if (cp < 0x10000) {              // three octets
-                *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
-                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            else {                                // four octets
-                *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
-                *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
-                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
-                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
-            }
-            return result;
-        }
-
-        template <typename octet_iterator>
-        uint32_t next(octet_iterator& it)
-        {
-            uint32_t cp = utf8::internal::mask8(*it);
-            typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
-            switch (length) {
-                case 1:
-                    break;
-                case 2:
-                    it++;
-                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
-                    break;
-                case 3:
-                    ++it; 
-                    cp = ((cp << 12) & 0xffff) + ((utf8::internal::mask8(*it) << 6) & 0xfff);
-                    ++it;
-                    cp += (*it) & 0x3f;
-                    break;
-                case 4:
-                    ++it;
-                    cp = ((cp << 18) & 0x1fffff) + ((utf8::internal::mask8(*it) << 12) & 0x3ffff);                
-                    ++it;
-                    cp += (utf8::internal::mask8(*it) << 6) & 0xfff;
-                    ++it;
-                    cp += (*it) & 0x3f; 
-                    break;
-            }
-            ++it;
-            return cp;        
-        }
-
-        template <typename octet_iterator>
-        uint32_t peek_next(octet_iterator it)
-        {
-            return utf8::unchecked::next(it);    
-        }
-
-        template <typename octet_iterator>
-        uint32_t prior(octet_iterator& it)
-        {
-            while (utf8::internal::is_trail(*(--it))) ;
-            octet_iterator temp = it;
-            return utf8::unchecked::next(temp);
-        }
-
-        // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
-        template <typename octet_iterator>
-        inline uint32_t previous(octet_iterator& it)
-        {
-            return utf8::unchecked::prior(it);
-        }
-
-        template <typename octet_iterator, typename distance_type>
-        void advance (octet_iterator& it, distance_type n)
-        {
-            for (distance_type i = 0; i < n; ++i)
-                utf8::unchecked::next(it);
-        }
-
-        template <typename octet_iterator>
-        typename std::iterator_traits<octet_iterator>::difference_type
-        distance (octet_iterator first, octet_iterator last)
-        {
-            typename std::iterator_traits<octet_iterator>::difference_type dist;
-            for (dist = 0; first < last; ++dist) 
-                utf8::unchecked::next(first);
-            return dist;
-        }
-
-        template <typename u16bit_iterator, typename octet_iterator>
-        octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
-        {       
-            while (start != end) {
-                uint32_t cp = utf8::internal::mask16(*start++);
-            // Take care of surrogate pairs first
-                if (utf8::internal::is_lead_surrogate(cp)) {
-                    uint32_t trail_surrogate = utf8::internal::mask16(*start++);
-                    cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
-                }
-                result = utf8::unchecked::append(cp, result);
-            }
-            return result;         
-        }
-
-        template <typename u16bit_iterator, typename octet_iterator>
-        u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
-        {
-            while (start < end) {
-                uint32_t cp = utf8::unchecked::next(start);
-                if (cp > 0xffff) { //make a surrogate pair
-                    *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
-                    *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
-                }
-                else
-                    *result++ = static_cast<uint16_t>(cp);
-            }
-            return result;
-        }
-
-        template <typename octet_iterator, typename u32bit_iterator>
-        octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
-        {
-            while (start != end)
-                result = utf8::unchecked::append(*(start++), result);
-
-            return result;
-        }
-
-        template <typename octet_iterator, typename u32bit_iterator>
-        u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
-        {
-            while (start < end)
-                (*result++) = utf8::unchecked::next(start);
-
-            return result;
-        }
-
-        // The iterator class
-        template <typename octet_iterator>
-          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
-            octet_iterator it;
-            public:
-            iterator () {};
-            explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
-            // the default "big three" are OK
-            octet_iterator base () const { return it; }
-            uint32_t operator * () const
-            {
-                octet_iterator temp = it;
-                return utf8::unchecked::next(temp);
-            }
-            bool operator == (const iterator& rhs) const 
-            { 
-                return (it == rhs.it);
-            }
-            bool operator != (const iterator& rhs) const
-            {
-                return !(operator == (rhs));
-            }
-            iterator& operator ++ () 
-            {
-                ::std::advance(it, utf8::internal::sequence_length(it));
-                return *this;
-            }
-            iterator operator ++ (int)
-            {
-                iterator temp = *this;
-                ::std::advance(it, utf8::internal::sequence_length(it));
-                return temp;
-            }  
-            iterator& operator -- ()
-            {
-                utf8::unchecked::prior(it);
-                return *this;
-            }
-            iterator operator -- (int)
-            {
-                iterator temp = *this;
-                utf8::unchecked::prior(it);
-                return temp;
-            }
-          }; // class iterator
-
-    } // namespace utf8::unchecked
-} // namespace utf8 
-
-
-#endif // header guard
-
diff --git a/plugins/new_gpg/new_gpg_10.vcxproj b/plugins/new_gpg/new_gpg_10.vcxproj
deleted file mode 100755
index 7dfa1d30fb..0000000000
--- a/plugins/new_gpg/new_gpg_10.vcxproj
+++ /dev/null
@@ -1,1031 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|X64">
-      <Configuration>Debug</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|X64">
-      <Configuration>Release</Configuration>
-      <Platform>X64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\clist.cpp" />
-    <ClCompile Include="src\gpg_wrapper.cpp" />
-    <ClCompile Include="src\icons.cpp" />
-    <ClCompile Include="src\init.cpp" />
-    <ClCompile Include="src\jabber_account.cpp" />
-    <ClCompile Include="src\log.cpp" />
-    <ClCompile Include="src\main.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|X64'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="src\messages.cpp" />
-    <ClCompile Include="src\metacontacts.cpp" />
-    <ClCompile Include="src\options.cpp" />
-    <ClCompile Include="src\srmm.cpp" />
-    <ClCompile Include="src\utilities.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\commonheaders.h" />
-    <ClInclude Include="src\constants.h" />
-    <ClInclude Include="src\globals.h" />
-    <ClInclude Include="src\gpg_wrapper.h" />
-    <ClInclude Include="src\jabber_account.h" />
-    <ClInclude Include="src\log.h" />
-    <ClInclude Include="src\main.h" />
-    <ClInclude Include="src\metacontacts.h" />
-    <ClInclude Include="src\m_extraicons.h" />
-    <ClInclude Include="src\m_metacontacts.h" />
-    <ClInclude Include="src\resource.h" />
-    <ClInclude Include="src\utilities.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\new_gpg.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\icons\secured.ico" />
-    <None Include="res\icons\unsecured.ico" />
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F29D0C8D-141A-43CF-86B2-34A04653F8D4}</ProjectGuid>
-    <RootNamespace>new_gpg</RootNamespace>
-    <ProjectName>new_gpg</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|X64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Plugins\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\Debug\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">$(SolutionDir)$(Configuration)64\Obj\$(ProjectName)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'">$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'">true</LinkIncremental>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'" />
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|X64'">AllRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|X64'" />
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>X:\install\git\miranda\mim_plugs;X:\install\git\miranda\miranda-im\miranda\include;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>X:\install\git\miranda\mim_plugs\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\..\boost_1_49_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|X64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\boost;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <AssemblerOutput>
-      </AssemblerOutput>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Debug/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\..\boost_1_49_0\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|X64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.\dependencies\include;..\..\..\boost_1_49_0;..\..\include</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <CompileAs>CompileAsCpp</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\..\boost_1_49_0\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
-      <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug x64|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;X:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;_UNICODE;UNICODE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>c:\temp\new_gpg.pch</PrecompiledHeaderOutputFile>
-      <AssemblerOutput>
-      </AssemblerOutput>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>X:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AssemblyDebug>true</AssemblyDebug>
-      <GenerateMapFile>false</GenerateMapFile>
-      <MapExports>false</MapExports>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Debug/testplug.lib</ImportLibrary>
-      <ProgramDatabaseFile>c:\debug\$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static)|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;C:\Boost\include\boost-1_45;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>c:\temp\new_gpg.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x:\temp\windows\libs\boost\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <SubSystem>NotSet</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (static) x64|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>MinSpace</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>x:\temp\windows\libs\utf8cpp\include;x:\temp\windows\libs\Boost\include;x:\install\git\miranda\miranda-im\miranda\include;x:\install\git\miranda\mim_plugs;../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <PrecompiledHeaderFile>commonheaders.h</PrecompiledHeaderFile>
-      <PrecompiledHeaderOutputFile>c:\temp\new_gpg.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <AdditionalLibraryDirectories>x:\temp\windows\libs\Boost\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>NotSet</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-      <ProgramDatabaseFile>c:\debug\$(TargetName).pdb</ProgramDatabaseFile>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)(static)|X64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|x64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|Win32'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode (service only)|X64'">
-    <Midl>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release Unicode (static)/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
-      <FloatingPointModel>Precise</FloatingPointModel>
-      <PrecompiledHeaderOutputFile>.\Release Unicode (static)/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Release Unicode (static)/</AssemblerListingLocation>
-      <ObjectFileName>.\Release Unicode (static)/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Release Unicode (static)/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Release Unicode (static)/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Release Unicode (static)/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug(service)|x64'">
-    <Midl>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MkTypLibCompatible>true</MkTypLibCompatible>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testplug.tlb</TypeLibraryName>
-      <HeaderFileName>
-      </HeaderFileName>
-    </Midl>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;TESTPLUG_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeaderOutputFile>.\Debug/testplug.pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\Debug/</AssemblerListingLocation>
-      <ObjectFileName>.\Debug/</ObjectFileName>
-      <ProgramDataBaseFileName>.\Debug/</ProgramDataBaseFileName>
-      <WarningLevel>Level3</WarningLevel>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Culture>0x0809</Culture>
-    </ResourceCompile>
-    <Link>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <RandomizedBaseAddress>false</RandomizedBaseAddress>
-      <DataExecutionPrevention>
-      </DataExecutionPrevention>
-      <ImportLibrary>.\Debug/testplug.lib</ImportLibrary>
-    </Link>
-    <Bscmake>
-      <SuppressStartupBanner>true</SuppressStartupBanner>
-      <OutputFile>.\Debug/testplug.bsc</OutputFile>
-    </Bscmake>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties RESOURCE_FILE="new_gpg.rc" />
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
-\ No newline at end of file
diff --git a/plugins/new_gpg/new_gpg_10.vcxproj.filters b/plugins/new_gpg/new_gpg_10.vcxproj.filters
deleted file mode 100755
index 37e663c898..0000000000
--- a/plugins/new_gpg/new_gpg_10.vcxproj.filters
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Sources">
-      <UniqueIdentifier>{56a6d5fd-c491-4d42-95e0-d0e98979acff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Resources">
-      <UniqueIdentifier>{8159144c-7020-4568-8bb4-53f4699faac6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Headers">
-      <UniqueIdentifier>{65abe24a-f835-47f5-9ebf-fbd3f55f993c}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\clist.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\gpg_wrapper.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\icons.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\init.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\jabber_account.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\log.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\main.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\messages.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\metacontacts.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\options.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\srmm.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\utilities.cpp">
-      <Filter>Sources</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\commonheaders.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\constants.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\globals.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\gpg_wrapper.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\jabber_account.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\log.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\m_extraicons.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\m_metacontacts.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\main.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\utilities.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\resource.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-    <ClInclude Include="src\metacontacts.h">
-      <Filter>Headers</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="res\new_gpg.rc">
-      <Filter>Resources</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="res\icons\secured.ico">
-      <Filter>Resources</Filter>
-    </None>
-    <None Include="res\icons\unsecured.ico">
-      <Filter>Resources</Filter>
-    </None>
-  </ItemGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/new_gpg/new_gpg_lang_ru.txt b/plugins/new_gpg/new_gpg_lang_ru.txt
deleted file mode 100755
index 4cf3659695..0000000000
--- a/plugins/new_gpg/new_gpg_lang_ru.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-;============================================================
-;  File: new_gpg.dll
-;  Module: new GPG encryption plugin
-;  Versions: 0.0.0.11
-;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=958
-;  Source: git://sss.chaoslab.ru/mim_plugs.git (checkout new_gpg)
-;  Authors: sss
-;============================================================
-
-[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
-���� ������ GPG ��������������. �������� ����� �������.\nGPG ������ �������� ���������.\n������� ��.
-[Copy own key]
-�����. ���� ����
-[Select own key]
-������� ���� ����
-[Export PubKey]
-��������� ����
-[GnuPG Variables]
-���� � GPG
-[Turn on debug log]
-���. ������ �������
-[Accept]
-�������
-[Accept and enable encryption]
-������� � �������� ����������
-[Replace]
-��������
-[Import key]
-������ �����
-[Load from file]
-������ �� �����
-[Load other]
-���������
-[Delete key]
-������� ����
-[Select existing]
-������� ������������
-[Turn on encryption]
-�������� ����������
-[Import key from keyserver]
-������ ����� � ������� ������
-[New public key was received, do you want to import it?]
-������� ����� ������� ����. �� ������ ��� �������?
-[There is existing key for contact, would you like to replace with new key ?]
-������� ����, �� � �������� ��� ���� ����. �� ������ ��� �������� �����?
-[The new public key was recieved]
-������� ����� ������� ����.
-[Received key from]
-������� ���� ��
-[Do you want to remove key from entire metacontact (all subcontacts) ?]
-�� ������ ������ ���� ��� ������������ (���� ������������)?
-[Select existing public key from list]
-������� �������� ���� �� ������
-[Encrypt file transfers]
-����������� �������� ������
-[Use jabber api on Miranda IM >= 0.9 (recomended)]
-������������ jabber api ���� Miranda IM >= 0.9 (�������������)
-[Current private key id]
-�������� ����
-[This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]
-��������� ���� exe �� GnuPG!\n������������� ������������ GnuPG v1.x.x � ���� ��������.
-[Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]
-���� ������ GnuPG �� �������������� � ����� �������� �� ���������!\n������������� ������������ GnuPG v1.x.x � ���� ��������.
-[Generate key]
-�������������
-[Select key for use]
-������� ����
-[Generate and use random key]
-������������� � ������������ ����
-[GnuPG binary:]
-���� � exe:
-[Home directory:]
-�������� �������:
-[Turn on key autoexchange]
-�������� ��������� �������
-[Key type:]
-��� �����:
-[Key length:]
-������ �����
-[Key password:]
-������ �����:
-[Real name:]
-���/���:
-[Comment:]
-�����������:
-[Expire date:]
-��������� �������� �����:
-[ex.: 2010-08-15]
-������: 2010-08-15
-[From 1024 to 4096]
-�� 1024 �� 4096
-[It can take a long time, be patient]
-* ��� ����� ������ ��������� �����.
-[0 - does not expire]
-0 - ������� �� �������������
-[Save password to database]
-��������� ������ � ����
-[Default password]
-������ �� ���������
-[Import]
-�������������
-[Select keyserver for key search:]
-������� ������ ������ ��� ������:
-[Userlist:]
-���� �������������:
-[Add tags to encoded and decoded messages]
-��������� ����� � ����������
-[Incomming message tags:]
-��������� ����� � �������� ����������:
-[Outgoing message tags:]
-��������� ����� ��������� ����������:
-[Open:]
-������
-[Close:]
-�����
diff --git a/plugins/new_gpg/res/icons/secured.ico b/plugins/new_gpg/res/icons/secured.ico
deleted file mode 100755
index 8d84167e56..0000000000
--- a/plugins/new_gpg/res/icons/secured.ico
+++ /dev/null
diff --git a/plugins/new_gpg/res/icons/unsecured.ico b/plugins/new_gpg/res/icons/unsecured.ico
deleted file mode 100755
index 567367b389..0000000000
--- a/plugins/new_gpg/res/icons/unsecured.ico
+++ /dev/null
diff --git a/plugins/new_gpg/res/new_gpg.rc b/plugins/new_gpg/res/new_gpg.rc
deleted file mode 100755
index f72f9ea9c5..0000000000
--- a/plugins/new_gpg/res/new_gpg.rc
+++ /dev/null
@@ -1,419 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "src/resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// ������� (������) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
-#pragma code_page(1251)
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_LOAD_PUBLIC_KEY DIALOGEX 0, 0, 338, 190
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Load Public GPG key"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "��",ID_OK,7,169,50,14
-    PUSHBUTTON      "Load from file",ID_LOAD_FROM_FILE,273,169,58,14
-    EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_VSCROLL,WS_EX_STATICEDGE
-    PUSHBUTTON      "Select existing",IDC_SELECT_EXISTING,113,169,97,14
-    CONTROL         "Turn on encryption",IDC_ENABLE_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,143,196,10
-    PUSHBUTTON      "Import key from keyserver",IDC_IMPORT,140,152,188,14,WS_DISABLED
-END
-
-IDD_FIRST_RUN DIALOGEX 0, 0, 291, 230
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Set own key"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "��",ID_OK,12,209,50,14,WS_DISABLED
-    CONTROL         "",IDC_KEY_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,44,277,105
-    PUSHBUTTON      "Generate key",IDC_GENERATE_KEY,8,152,74,14
-    LTEXT           "Select key for use",IDC_STATIC,16,33,186,8
-    EDITTEXT        IDC_KEY_PASSWORD,94,168,77,14,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "Key password:",IDC_STATIC,12,170,76,8
-    PUSHBUTTON      "Load other",IDC_OTHER,83,152,64,14
-    PUSHBUTTON      "Delete key",IDC_DELETE_KEY,149,152,70,14
-    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,99,184,118,14
-    LTEXT           "",IDC_GENERATING_KEY,82,207,174,8
-    LTEXT           "Account:",IDC_STATIC,15,12,42,8
-    LTEXT           "key id: ",IDC_KEY_ID,178,12,99,8
-    COMBOBOX        IDC_ACCOUNT,66,9,104,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-END
-
-IDD_BIN_PATH DIALOGEX 0, 0, 354, 108
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Set GPG bin path and keyring home dir."
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Continue",ID_OK,7,87,50,14
-    LTEXT           "Home directory:",IDC_STATIC,9,34,325,8
-    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8
-    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,293,18,54,14
-    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,293,44,54,14
-    EDITTEXT        IDC_HOME_DIR,7,44,277,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_BIN_PATH,7,17,277,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,166,87,118,14
-    CONTROL         "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,277,10
-END
-
-IDD_NEW_KEY DIALOGEX 0, 0, 427, 68
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "The new public key was recieved"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "Import key",ID_IMPORT,9,47,46,14
-    PUSHBUTTON      "Accept and enable encryption",IDC_IMPORT_AND_USE,156,47,119,14
-    PUSHBUTTON      "Ignore",IDC_IGNORE_KEY,368,47,52,14
-    CTEXT           "�����������",IDC_MESSAGE,18,25,392,8
-    CTEXT           "�����������",IDC_KEY_FROM,16,12,395,8
-END
-
-IDD_KEY_GEN DIALOGEX 0, 0, 284, 169
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Key Generation dialog"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,7,148,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,227,148,50,14
-    COMBOBOX        IDC_KEY_TYPE,120,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
-    EDITTEXT        IDC_KEY_LENGTH,120,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
-    EDITTEXT        IDC_KEY_PASSWD,120,46,55,14,ES_AUTOHSCROLL | WS_GROUP
-    EDITTEXT        IDC_KEY_REAL_NAME,120,61,55,14,ES_AUTOHSCROLL | WS_GROUP
-    EDITTEXT        IDC_KEY_EMAIL,120,76,55,14,ES_AUTOHSCROLL | WS_GROUP
-    EDITTEXT        IDC_KEY_COMMENT,120,91,55,14,ES_AUTOHSCROLL | WS_GROUP
-    EDITTEXT        IDC_KEY_EXPIRE_DATE,120,106,55,14,ES_AUTOHSCROLL | WS_GROUP
-    LTEXT           "Key type:",IDC_STATIC,8,16,96,8
-    LTEXT           "Key length:",IDC_STATIC,7,32,106,8
-    LTEXT           "Key password:",IDC_STATIC,7,49,105,8
-    LTEXT           "Real name:",IDC_STATIC,7,63,105,8
-    LTEXT           "Email:",IDC_STATIC,7,79,108,8
-    LTEXT           "Comment:",IDC_STATIC,7,92,107,8
-    LTEXT           "Expire date:",IDC_STATIC,7,109,111,8
-    LTEXT           "ex.: 2010-08-15",IDC_STATIC,182,108,75,8
-    LTEXT           "From 1024 to 4096",IDC_STATIC,168,33,89,8
-    LTEXT           "It can take a long time, be patient",IDC_GENERATING_TEXT,15,132,246,8
-    LTEXT           "0 - does not expire",IDC_STATIC,122,122,141,8
-END
-
-IDD_LOAD_EXISTING_KEY DIALOGEX 0, 0, 370, 257
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Select existing public key from list"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "��",IDOK,7,236,50,14,WS_DISABLED
-    PUSHBUTTON      "Cancel",IDCANCEL,313,236,50,14
-    CONTROL         "",IDC_EXISTING_KEY_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,14,356,217
-END
-
-IDD_KEY_PASSWD DIALOGEX 0, 0, 207, 108
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Enter password for your secret key"
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    DEFPUSHBUTTON   "��",IDOK,7,87,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,150,87,50,14
-    EDITTEXT        IDC_PASSWORD,13,38,179,14,ES_PASSWORD | ES_AUTOHSCROLL
-    LTEXT           "Password:",IDC_STATIC,14,28,34,8
-    CONTROL         "Save password to database",IDC_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,56,124,10
-    LTEXT           "",IDC_KEYID,14,14,179,8
-    CONTROL         "Default password",IDC_DEFAULT_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,67,151,10
-END
-
-IDD_IMPORT_KEY DIALOGEX 0, 0, 161, 81
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Set GPG bin path and keyring home dir."
-FONT 8, "MS Shell Dlg", 400, 0, 0x1
-BEGIN
-    PUSHBUTTON      "Import",IDC_IMPORT,15,56,50,14
-    LTEXT           "Select keyserver for key search:",IDC_STATIC,16,20,122,8
-    COMBOBOX        IDC_KEYSERVER,15,34,125,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_LOAD_PUBLIC_KEY, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 331
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 183
-    END
-
-    IDD_FIRST_RUN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 284
-        VERTGUIDE, 15
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 223
-        HORZGUIDE, 20
-    END
-
-    IDD_BIN_PATH, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 347
-        VERTGUIDE, 284
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 101
-    END
-
-    IDD_NEW_KEY, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 420
-        TOPMARGIN, 6
-        BOTTOMMARGIN, 61
-    END
-
-    IDD_KEY_GEN, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 277
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 162
-    END
-
-    IDD_LOAD_EXISTING_KEY, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 363
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 250
-    END
-
-    IDD_KEY_PASSWD, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 200
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 101
-    END
-
-    IDD_IMPORT_KEY, DIALOG
-    BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 154
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 74
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_SECURED             ICON                    "icons\\secured.ico"
-IDI_UNSECURED           ICON                    "icons\\unsecured.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,0,11
- PRODUCTVERSION 0,9,0,0
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "041904b0"
-        BEGIN
-            VALUE "FileDescription", "new_gpg"
-            VALUE "FileVersion", "0.0.0.11"
-            VALUE "InternalName", "new_gpg"
-            VALUE "LegalCopyright", "Copyright (C) 2010-2011 sss"
-            VALUE "OriginalFilename", "new_gpg"
-            VALUE "ProductName", "new_gpg"
-            VALUE "ProductVersion", "0.9.0.0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x419, 1200
-    END
-END
-
-#endif    // ������� (������) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
-// ���������� (���) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-#pragma code_page(1252)
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_OPT_GPG DIALOGEX 0, 0, 286, 214
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112
-    CTEXT           "Userlist:",IDC_STATIC,25,7,201,8
-    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14
-    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14
-    PUSHBUTTON      "Select own key",IDC_SELECT_KEY,205,193,74,14
-    CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10
-    EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL
-    PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14
-    CONTROL         "Use jabber api on Miranda IM >= 0.9 (recomended)",IDC_JABBER_API,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10
-    LTEXT           "Default key",IDC_CURRENT_KEY,12,196,110,8
-    CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10
-    CONTROL         "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10
-    PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,193,74,14
-END
-
-IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 214
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,216,17,60,14
-    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,217,44,57,14
-    EDITTEXT        IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL
-    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8
-    LTEXT           "Home directory:",IDC_STATIC,9,34,144,8
-END
-
-IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 241
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "Add tags to encoded and decoded messages",IDC_APPEND_TAGS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10
-    EDITTEXT        IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL
-    LTEXT           "Incomming message tags:",IDC_STATIC,15,10,84,8
-    LTEXT           "Outgoing message tags:",IDC_STATIC,13,36,79,8
-    RTEXT           "Open:",IDC_STATIC,13,23,26,8
-    RTEXT           "Close:",IDC_STATIC,127,23,23,8
-    EDITTEXT        IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL
-    EDITTEXT        IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL
-    RTEXT           "Open:",IDC_STATIC,13,49,26,8
-    RTEXT           "Close:",IDC_STATIC,127,49,23,8
-    CONTROL         "Strip all tags in outgoing messages",IDC_STRIP_TAGS,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10
-END
-
-IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 214
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-FONT 8, "MS Shell Dlg", 400, 0, 0x0
-BEGIN
-    CONTROL         "Turn on presence signing (Jabber)",IDC_PRESCENSE_SUBSCRIPTION,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,190,10
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// DESIGNINFO
-//
-
-#ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO
-BEGIN
-    IDD_OPT_GPG, DIALOG
-    BEGIN
-    END
-
-    IDD_OPT_GPG_BIN, DIALOG
-    BEGIN
-    END
-
-    IDD_OPT_GPG_MESSAGES, DIALOG
-    BEGIN
-    END
-
-    IDD_OPT_GPG_ADVANCED, DIALOG
-    BEGIN
-        VERTGUIDE, 12
-    END
-END
-#endif    // APSTUDIO_INVOKED
-
-#endif    // ���������� (���) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/plugins/new_gpg/src/clist.cpp b/plugins/new_gpg/src/clist.cpp
deleted file mode 100755
index c64fb17798..0000000000
--- a/plugins/new_gpg/src/clist.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright � 2010-2012 SecureIM developers (baloo and others), sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-extern HANDLE g_hCLIcon;
-void RefreshContactListIcons(void);
-
-int onExtraImageListRebuilding(WPARAM, LPARAM) 
-{
-	if(g_hCLIcon && ServiceExists(MS_CLIST_EXTRA_ADD_ICON) ) 
-		RefreshContactListIcons();
-	return 0;
-}
-
-
-int onExtraImageApplying(WPARAM wParam, LPARAM) 
-{
-	void setClistIcon(HANDLE);
-	if(g_hCLIcon && ServiceExists(MS_CLIST_EXTRA_SET_ICON)) 
-	{
-//		IconExtraColumn iec = {0}; //need to init this
-		if( g_hCLIcon ) 
-			setClistIcon((HANDLE)wParam);
-//			ExtraIcon_SetIcon(g_hCLIcon, (HANDLE)wParam, iec.hImage);
-	}
-	return 0;
-}
diff --git a/plugins/new_gpg/src/commonheaders.h b/plugins/new_gpg/src/commonheaders.h
deleted file mode 100755
index 459d76ef64..0000000000
--- a/plugins/new_gpg/src/commonheaders.h
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef COMMONHEADERS_H
-#define COMMONHEADERS_H
-#define MIRANDA_VER 0x0901
-//windows
-#include <windows.h>
-#include <shlobj.h>
-#include <io.h>
-#include <uxtheme.h>
-#include <shlwapi.h>
-#include <richedit.h>
-//c
-#include <locale.h>
-#include <errno.h>
-#include <time.h>
-//c++
-#include <iostream>
-#include <map>
-using std::map;
-#include <list>
-using std::list;
-#include <vector>
-using std::vector;
-#include <string>
-using std::string;
-using std::wstring;
-#include <fstream>
-using std::wfstream;
-using std::fstream;
-
-//boost
-#include <boost/thread/thread.hpp>
-#include <boost/thread/mutex.hpp>
-#include <boost/nondet_random.hpp>
-#include <boost/random/variate_generator.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/date_time.hpp>
-
-
-//utf8cpp
-#include <utf8.h>
-
-//miranda
-#include <newpluginapi.h>
-#include <m_database.h>
-#include <m_options.h>
-#include <m_langpack.h>
-#include <m_clist.h>
-#include <m_clui.h>
-#include <m_icolib.h>
-#include <m_skin.h>
-#include <m_protomod.h>
-#include <m_protosvc.h>
-#include <m_netlib.h>
-#include <m_jabber.h>
-#include <m_icqplus.h>
-#include <m_message.h>
-#include <m_cluiframes.h>
-#include <m_icolib.h>
-#include "m_extraicons.h"
-#include "m_metacontacts.h"
-#include "resource.h"
-
-
-//internal
-#include "constants.h"
-#include "log.h"
-#include "globals.h"
-#include "utilities.h"
-#include "main.h"
-#include "gpg_wrapper.h"
-#include "jabber_account.h"
-#include "metacontacts.h"
-#endif
diff --git a/plugins/new_gpg/src/constants.h b/plugins/new_gpg/src/constants.h
deleted file mode 100755
index 2982f31489..0000000000
--- a/plugins/new_gpg/src/constants.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#ifndef CONSTANTS_H
-#define CONSTANTS_H
-#define szGPGModuleName "GPG"
-#define PREF_METANODB	0x2000
-#endif
diff --git a/plugins/new_gpg/src/globals.h b/plugins/new_gpg/src/globals.h
deleted file mode 100755
index e84ae1e505..0000000000
--- a/plugins/new_gpg/src/globals.h
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef GLOBALS_H
-#define GLOBALS_H
-extern bool bAppendTags, bPresenceSigning, bStripTags, gpg_valid, gpg_keyexist, tabsrmm_used;
-extern TCHAR *inopentag, *inclosetag, *outopentag, *outclosetag;
-extern logtofile debuglog;
-#endif
diff --git a/plugins/new_gpg/src/gpg_wrapper.cpp b/plugins/new_gpg/src/gpg_wrapper.cpp
deleted file mode 100755
index 38f86889a4..0000000000
--- a/plugins/new_gpg/src/gpg_wrapper.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright � 2010-2012 sss
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-//thx gpg module from Harald Treder, Zakhar V. Bardymov
-
-//boost::mutex gpg_mutex;
-
-
-pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result, HANDLE hProcess, PROCESS_INFORMATION *pr)
-{
-//	gpg_mutex.lock();
-	if(!gpg_valid)
-		return pxNotConfigured;
-	extern logtofile debuglog;
-	BOOL success;
-	STARTUPINFO sinfo = {0};
-	SECURITY_ATTRIBUTES sattrs = {0};
-	SECURITY_DESCRIPTOR sdesc = {0};
-	PROCESS_INFORMATION pri = {0};
-	HANDLE  newstdin, newstdout, readstdout, writestdin;
-	char *inputpos;
-	unsigned long transfered;
-	int size;
-
-	wstring commandline;
-
-	sattrs.nLength=sizeof(SECURITY_ATTRIBUTES);
-	sattrs.bInheritHandle=TRUE;
-	InitializeSecurityDescriptor(&sdesc,SECURITY_DESCRIPTOR_REVISION);
-	SetSecurityDescriptorDacl(&sdesc,TRUE,NULL,FALSE);
-	sattrs.lpSecurityDescriptor=&sdesc;
-
-	success=CreatePipe(&newstdin,&writestdin,&sattrs,0);
-	if (!success)
-	{
-		*result = pxCreatePipeFailed;
-		return pxCreatePipeFailed;
-	}
-
-	success=CreatePipe(&readstdout,&newstdout,&sattrs,0);
-	if (!success)
-	{
-		CloseHandle(newstdin);
-		CloseHandle(writestdin);
-		*result = pxCreatePipeFailed;
-		return pxCreatePipeFailed;
-	}
-
-	GetStartupInfo(&sinfo);
-	sinfo.dwFlags=STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
-	sinfo.wShowWindow=SW_HIDE;
-	sinfo.hStdOutput=newstdout;
-	sinfo.hStdError=newstdout;
-	sinfo.hStdInput=newstdin;
-
-	char *mir_path = new char [MAX_PATH];
-	CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-	SetCurrentDirectoryA(mir_path);
-	delete [] mir_path;
-
-	TCHAR *bin_path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T(""));
-	{
-		if(_waccess(bin_path, 0) == -1)
-		{
-			if(errno == ENOENT)
-			{
-				mir_free(bin_path);
-				debuglog<<time_str()<<": GPG executable not found\n";
-				*result = pxNotFound;
-				return pxNotFound;
-			}
-		}
-	}
-	TCHAR *home_dir = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-	{ //form initial command
-		commandline += _T("\"");
-		commandline += bin_path;
-		commandline += _T("\" --homedir \"");
-		commandline += home_dir;
-		commandline += _T("\" ");
-		commandline += _T("--display-charset utf-8 ");
-		commandline += _T("-z 9 ");
-		commandline += *acommandline;
-		mir_free(bin_path);
-		mir_free(home_dir);
-	}
-
-	debuglog<<time_str()<<": gpg in: "<<commandline<<"\n";
-
-	success = CreateProcess(NULL, (TCHAR*)commandline.c_str(), NULL, NULL, TRUE, CREATE_NEW_CONSOLE | CREATE_UNICODE_ENVIRONMENT, (void*)_T("LANGUAGE=en@quot\0LC_ALL=English\0"), NULL, &sinfo, &pri);
-
-	if (!success)
-	{
-		CloseHandle(newstdin);
-		CloseHandle(writestdin);
-		CloseHandle(newstdout);
-		CloseHandle(readstdout);
-		debuglog<<time_str()<<": Failed to create process\n";
-//		gpg_mutex.unlock();
-		*result = pxCreateProcessFailed;
-		return pxCreateProcessFailed;
-	}
-
-	hProcess = pri.hProcess;
-
-	inputpos=ainput;
-
-	while (TRUE)
-	{
-		if(!pri.hProcess)
-			break;
-		success=GetExitCodeProcess(pri.hProcess,aexitcode);
-		if (success && *aexitcode!=STILL_ACTIVE)
-			break;
-
-		storeOutput(readstdout,aoutput);
-
-		if (*inputpos!='\0') size=1;
-		else size=0;
-
-		success=WriteFile(writestdin,inputpos,size,&transfered,NULL);
-		inputpos+=transfered;
-		boost::this_thread::sleep(boost::posix_time::milliseconds(200));
-	}
-
-	storeOutput(readstdout,aoutput);
-
-	debuglog<<time_str()<<": gpg out: "<<aoutput->c_str();
-
-	WaitForSingleObject(pri.hProcess,INFINITE);
-
-	CloseHandle(pri.hThread);
-	CloseHandle(pri.hProcess);
-	CloseHandle(newstdin);
-	CloseHandle(newstdout);
-	CloseHandle(readstdout);
-	CloseHandle(writestdin);
-
-	*result = pxSuccess;
-//	gpg_mutex.unlock();
-	return pxSuccess;
-}
-
-void pxEexcute_thread(void *param)
-{
-	gpg_execution_params *params = (gpg_execution_params*)param;
-	pxResult result = pxExecute(params->cmd, params->useless, params->out, params->code, params->result, params->hProcess, params->proc);
-}
diff --git a/plugins/new_gpg/src/gpg_wrapper.h b/plugins/new_gpg/src/gpg_wrapper.h
deleted file mode 100755
index 5501297baf..0000000000
--- a/plugins/new_gpg/src/gpg_wrapper.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright � 2010-2012 sss
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#ifndef GPG_WRAPPER_H
-#define GPG_WRAPPER_H
-typedef enum {
-	pxSuccess,
-	pxSuccessExitCodeInvalid,
-	pxCreatePipeFailed,
-	pxDuplicateHandleFailed,
-	pxCloseHandleFailed,
-	pxCreateProcessFailed,
-	pxThreadWaitFailed,
-	pxReadFileFailed,
-	pxBufferOverflow,
-	pxNotFound,
-	pxNotConfigured
-}
-pxResult;
-
-pxResult pxExecute(wstring *acommandline, char *ainput, string *aoutput, LPDWORD aexitcode, pxResult *result);
-
-struct gpg_execution_params
-{
-	wstring *cmd;
-	char *useless;
-	string *out;
-	LPDWORD code;
-	pxResult *result;
-	HANDLE hProcess;
-	PROCESS_INFORMATION *proc;
-};
-
-void pxEexcute_thread(void *param);
-
-#endif
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/icons.cpp b/plugins/new_gpg/src/icons.cpp
deleted file mode 100755
index c981eea46c..0000000000
--- a/plugins/new_gpg/src/icons.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright � 2010-2012 SecureIM developers (baloo and others), sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-HANDLE IconLibDefine(TCHAR* desc, TCHAR* section, char* ident, HICON icon, char* def_file, int def_idx, int size)
-{
-  SKINICONDESC sid = {0};
-  HANDLE hIcon;
-
-  if(!size)
-	  size = 16;
-
-  sid.cbSize = sizeof( SKINICONDESC );
-  sid.ptszSection = section;
-  sid.ptszDescription = desc;
-  sid.flags = SIDF_TCHAR;
-
-  sid.pszName = ident;
-  sid.pszDefaultFile = def_file;
-  sid.iDefaultIndex = def_idx;
-  sid.hDefaultIcon = icon;
-  sid.cx = sid.cy = size;
-  
-  hIcon =  Skin_AddIcon(&sid);
-
-  return hIcon;
-}
-
-
-void InitIconLib()
-{
-	extern HINSTANCE hInst;
-    char lib[MAX_PATH];
-    GetModuleFileNameA(hInst, lib, MAX_PATH);
-	TCHAR *module = mir_a2t(szGPGModuleName);
-
-	IconLibDefine(_T("Secured"), module, "secured", NULL, lib, -IDI_SECURED,0);
-	IconLibDefine(_T("Unsecured"), module, "unsecured", NULL, lib, -IDI_UNSECURED,0);
-	mir_free(module);
-}
-
-
-
-
-
-HICON IconLibGetIcon(const char* ident)
-{
-  return (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)ident);
-}
-
-
-
-void IconLibReleaseIcon(const char* ident)
-{
-  CallService(MS_SKIN2_RELEASEICON, 0, (LPARAM)ident);
-}
-
-
-
-HANDLE IconLibHookIconsChanged(MIRANDAHOOK hook)
-{
-  return HookEvent(ME_SKIN2_ICONSCHANGED, hook);
-}
-
-
-void setClistIcon(HANDLE hContact)
-{
-	bool enabled = isContactSecured(hContact);
-	extern HANDLE g_hCLIcon;
-	HANDLE hMC = hContact;
-	if(metaIsSubcontact(hContact))
-		hMC = metaGetContact(hContact);
-	else if(metaIsProtoMetaContacts(hContact))
-		hMC = metaGetContact(hContact);
-	if(g_hCLIcon && enabled)
-	{
-		HICON icon = IconLibGetIcon("secured");
-		IconExtraColumn iec = {0};
-		iec.cbSize = sizeof(iec);
-		iec.hImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)icon, (LPARAM)0);
-		ExtraIcon_SetIcon(g_hCLIcon, hContact, iec.hImage);
-		if(hMC)
-			ExtraIcon_SetIcon(g_hCLIcon, hMC, iec.hImage);
-	}
-	else
-	{
-		ExtraIcon_SetIcon(g_hCLIcon, hContact, (HANDLE)0); // is it right ? hmm.., at least working....
-		if(hMC)
-			ExtraIcon_SetIcon(g_hCLIcon, hMC, (HANDLE)0);
-	}
-}
-
-void setSrmmIcon(HANDLE h)
-{
-	HANDLE hContact = metaIsProtoMetaContacts(h)?metaGetMostOnline(h):h;
-	bool enabled = isContactSecured(hContact);	
-	HANDLE hMC = hContact;
-	if(metaIsSubcontact(hContact))
-		hMC = metaGetContact(hContact);
-	else if(metaIsProtoMetaContacts(hContact))
-		hMC = metaGetContact(hContact);
-	if(ServiceExists(MS_MSG_MODIFYICON))
-	{
-		StatusIconData sid = {0};
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.hIcon = IconLibGetIcon("secured");
-		sid.dwId = 0x00000001;
-		sid.flags = enabled?0:MBF_HIDDEN;
-		CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
-		if( hMC )
-			CallService(MS_MSG_MODIFYICON, (WPARAM)hMC, (LPARAM)&sid);
-		ZeroMemory(&sid, sizeof(sid));
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.hIcon = IconLibGetIcon("unsecured");
-		sid.dwId = 0x00000002;
-		sid.flags = enabled?MBF_HIDDEN:0;
-		CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid);
-		if( hMC )
-			CallService(MS_MSG_MODIFYICON, (WPARAM)hMC, (LPARAM)&sid);
-	}
-}
-
-
-void RefreshContactListIcons() 
-{
-	HANDLE hContact;
-	extern HANDLE g_hCLIcon;
-	CallService(MS_CLUI_LISTBEGINREBUILD,0,0);
-	hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);
-	while (hContact) 
-	{
-		setClistIcon(hContact);
-		hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0);
-	}
-	CallService(MS_CLUI_LISTENDREBUILD,0,0);
-}
diff --git a/plugins/new_gpg/src/init.cpp b/plugins/new_gpg/src/init.cpp
deleted file mode 100755
index 90030b0547..0000000000
--- a/plugins/new_gpg/src/init.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-//global variables
-bool bAppendTags = false, bDebugLog = false, bJabberAPI = false, bPresenceSigning = false, bIsMiranda09 = false, bMetaContacts = false, bFileTransfers = false, bAutoExchange = false, bStripTags = false, tabsrmm_used = false;
-TCHAR *inopentag = NULL, *inclosetag = NULL, *outopentag = NULL, *outclosetag = NULL, *password = NULL;
-
-list <JabberAccount*> Accounts;
-
-HINSTANCE hInst;
-HANDLE hLoadPubKey = NULL, hToggleEncryption = NULL, hOnPreBuildContactMenu = NULL, hSendKey = NULL, g_hCLIcon = NULL, hExportGpgKeys = NULL, hImportGpgKeys = NULL;
-IconExtraColumn g_IEC = {0};
-static int OnModulesLoaded(WPARAM wParam,LPARAM lParam);
-extern char *date();
-RECT key_from_keyserver_rect = {0}, firstrun_rect = {0}, new_key_rect = {0}, key_gen_rect = {0}, load_key_rect = {0}, import_key_rect = {0}, key_password_rect = {0}, load_existing_key_rect = {0};
-XML_API xi = {0};
-int hLangpack = 0;
-logtofile debuglog;
-bool gpg_valid = false, gpg_keyexist = false;
-std::map<HANDLE, contact_data> hcontact_data;
-
-
-#define MIID_GPG { 0x4227c050, 0x8d97, 0x48d2, { 0x91, 0xec, 0x6a, 0x95, 0x2b, 0x3d, 0xab, 0x94 } }
-
-PLUGININFOEX pluginInfo={
-	sizeof(PLUGININFOEX),
-	0,
-	PLUGIN_MAKE_VERSION(0,0,0,11),
-	"new GPG encryption support plugin, based on code from old gpg plugin and secureim",
-	"sss",
-	"sss123next@list.ru",
-	"� 2010-2012 sss",
-	"http://sss.chaoslab.ru/tracker/mim_plugs/",
-	1,		//unicode
-	MIID_GPG
-};
-
-BOOL WINAPI DllMain(HINSTANCE hinstDLL,DWORD fdwReason,LPVOID lpvReserved)
-{
-	hInst=hinstDLL;
-	return TRUE;
-}
-
-
-extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
-{
-	static char plugname[52];
-	strcpy(plugname, szGPGModuleName" [");
-	strcat(plugname, date());
-	strcat(plugname, " ");
-	strcat(plugname, __TIME__);
-	strcat(plugname, "]");
-	pluginInfo.shortName = plugname;
-	return &pluginInfo;
-}
-
-static const MUUID interfaces[] = {MIID_GPG, MIID_LAST};
-extern "C" __declspec(dllexport) const MUUID* MirandaPluginInterfaces(void)
-{
-	return interfaces;
-}
-
-int LoadKey(WPARAM w, LPARAM l);
-int ToggleEncryption(WPARAM w, LPARAM l);
-int SendKey(WPARAM w, LPARAM l);
-int ExportGpGKeys(WPARAM w, LPARAM l);
-int ImportGpGKeys(WPARAM w, LPARAM l);
-
-void init_vars()
-{
-	bAppendTags = DBGetContactSettingByte(NULL, szGPGModuleName, "bAppendTags", 0);
-	bStripTags = DBGetContactSettingByte(NULL, szGPGModuleName, "bStripTags", 0);
-	inopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>"));
-	inclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GPGdec>"));
-	outopentag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("<GPGenc>"));
-	outclosetag = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GPGenc>"));
-	bDebugLog = DBGetContactSettingByte(NULL, szGPGModuleName, "bDebugLog", 0);
-	bAutoExchange = DBGetContactSettingByte(NULL, szGPGModuleName, "bAutoExchange", 0);
-	password = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
-	debuglog.init();
-	bJabberAPI = DBGetContactSettingByte(NULL, szGPGModuleName, "bJabberAPI", bIsMiranda09?1:0);
-	bPresenceSigning = DBGetContactSettingByte(NULL, szGPGModuleName, "bPresenceSigning", 0);
-	bFileTransfers = DBGetContactSettingByte(NULL, szGPGModuleName, "bFileTransfers", 0);
-	firstrun_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowX", 0);
-	firstrun_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowY", 0);
-	key_password_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "PasswordWindowX", 0);
-	key_password_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "PasswordWindowY", 0);
-	key_gen_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "KeyGenWindowX", 0);
-	key_gen_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "KeyGenWindowY", 0);
-	load_key_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowX", 0);
-	load_key_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", 0);
-	import_key_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "ImportKeyWindowX", 0);
-	import_key_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "ImportKeyWindowY", 0);
-	new_key_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "NewKeyWindowX", 0);
-	new_key_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "NewKeyWindowY", 0);
-	load_existing_key_rect.left = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowX", 0);
-	load_existing_key_rect.top = DBGetContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowY", 0);
-	tabsrmm_used = isTabsrmmUsed();
-}
-
-extern "C" int __declspec(dllexport) Load()
-{
-	HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
-	mir_getXI(&xi);	//TODO: check if we have access to api
-	mir_getLP(&pluginInfo);
-	init_vars();
-	CreateServiceFunction("/LoadPubKey",(MIRANDASERVICE)LoadKey);
-	CreateServiceFunction("/ToggleEncryption",(MIRANDASERVICE)ToggleEncryption);
-	CreateServiceFunction("/SendKey",(MIRANDASERVICE)SendKey);
-	CreateServiceFunction("/ExportGPGKeys",(MIRANDASERVICE)ExportGpGKeys);
-	CreateServiceFunction("/ImportGPGKeys",(MIRANDASERVICE)ImportGpGKeys);
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFF;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Load GPG public key";
-	mi.pszService="/LoadPubKey";
-	hLoadPubKey = Menu_AddContactMenuItem(&mi);
-	ZeroMemory(&mi,sizeof(mi));
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFe;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Toggle GPG encryption";
-	mi.pszService="/ToggleEncryption";
-	hToggleEncryption = Menu_AddContactMenuItem(&mi);
-	ZeroMemory(&mi,sizeof(mi));
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFe;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Send public key";
-	mi.pszService="/SendKey";
-	hSendKey = Menu_AddContactMenuItem(&mi);
-	ZeroMemory(&mi,sizeof(mi));
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFF;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Export GPG Public keys from all users";
-	mi.pszService="/ExportGPGKeys";
-	hExportGpgKeys = Menu_AddMainMenuItem(&mi);
-	ZeroMemory(&mi,sizeof(mi));
-	mi.cbSize=sizeof(mi);
-	mi.position=-0x7FFFFFFF;
-	mi.flags=0;
-	mi.hIcon=LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);
-	mi.pszName="Import GPG Public keys from all users";
-	mi.pszService="/ImportGPGKeys";
-	hImportGpgKeys = Menu_AddMainMenuItem(&mi);
-
-	return 0;
-}
-
-int AddContact(WPARAM w, LPARAM l)
-{
-	CallService(MS_PROTO_ADDTOCONTACT,w,(LPARAM)szGPGModuleName);
-	return 0;
-}
-
-
-static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
-{
-
-	int GpgOptInit(WPARAM wParam,LPARAM lParam);
-	int OnPreBuildContactMenu(WPARAM w, LPARAM l);
-	int RecvMsgSvc(WPARAM w, LPARAM l);
-	int SendMsgSvc(WPARAM w, LPARAM l);
-	int HookSendMsg(WPARAM w, LPARAM l);
-//	int TestHook(WPARAM w, LPARAM l);
-	int GetJabberInterface(WPARAM w, LPARAM l);
-	int onWindowEvent(WPARAM wParam, LPARAM lParam);
-	int onIconPressed(WPARAM wParam, LPARAM lParam);
-	int onExtraImageListRebuilding(WPARAM, LPARAM);
-	int onExtraImageApplying(WPARAM wParam, LPARAM);
-	int onProtoAck(WPARAM, LPARAM);
-	int onSendFile(WPARAM, LPARAM);
-	void InitIconLib();
-
-	void InitCheck();
-	void FirstRun();
-	bIsMiranda09 = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0) >= 0x00090001?true:false;
-	FirstRun();
-	InitCheck();
-	InitIconLib();
-	if(ServiceExists(MS_MSG_ADDICON)) 
-	{
-		HICON IconLibGetIcon(const char* ident);
-		StatusIconData sid = {0};
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.flags = MBF_HIDDEN;
-		sid.dwId = 0x00000001;
-		sid.hIcon = IconLibGetIcon("secured");
-		sid.szTooltip = Translate("GPG Turn off encryption");
-		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
-		ZeroMemory(&sid, sizeof(sid));
-		sid.cbSize = sizeof(sid);
-		sid.szModule = szGPGModuleName;
-		sid.flags = MBF_HIDDEN;
-		sid.dwId = 0x00000002;
-		sid.hIcon = IconLibGetIcon("unsecured");
-		sid.szTooltip = Translate("GPG Turn on encryption");
-		CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid);
-	}
-
-
-	bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT);
-	
-	if(bJabberAPI && bIsMiranda09)
-		GetJabberInterface(0,0);
-
-	HookEvent(ME_OPT_INITIALISE, GpgOptInit);
-	HookEvent(ME_DB_EVENT_FILTER_ADD, HookSendMsg);
-	if(bJabberAPI && bIsMiranda09)
-		HookEvent(ME_PROTO_ACCLISTCHANGED, GetJabberInterface);
-
-	HookEvent(ME_PROTO_ACK, onProtoAck); //filetransfer unimplemented now
-
-	HookEvent(ME_CLIST_PREBUILDCONTACTMENU, OnPreBuildContactMenu);
-
-	HookEvent(ME_MSG_WINDOWEVENT, onWindowEvent);
-	HookEvent(ME_MSG_ICONPRESSED, onIconPressed);
-
-	if(ServiceExists(MS_EXTRAICON_REGISTER)) 
-		g_hCLIcon = ExtraIcon_Register(szGPGModuleName, Translate("GPG encryption status"), "secured", (MIRANDAHOOK)onExtraImageListRebuilding, (MIRANDAHOOK)onExtraImageApplying);
-
-
-
-	PROTOCOLDESCRIPTOR pd = {0};
-	pd.cbSize=sizeof(PROTOCOLDESCRIPTOR);
-	pd.szName=szGPGModuleName;
-	pd.type=PROTOTYPE_ENCRYPTION;
-	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);
-	
-	CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE, (MIRANDASERVICE)RecvMsgSvc);
-	CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE, (MIRANDASERVICE)SendMsgSvc);
-	CreateProtoServiceFunction(szGPGModuleName, PSR_MESSAGE"W", (MIRANDASERVICE)RecvMsgSvc);
-	CreateProtoServiceFunction(szGPGModuleName, PSS_MESSAGE"W", (MIRANDASERVICE)SendMsgSvc);
-
-	CreateProtoServiceFunction(szGPGModuleName, PSS_FILE, (MIRANDASERVICE)onSendFile);
-	CreateProtoServiceFunction(szGPGModuleName, PSS_FILE"W", (MIRANDASERVICE)onSendFile);
-
-	for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
-		if (!CallService(MS_PROTO_ISPROTOONCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName))
-			CallService(MS_PROTO_ADDTOCONTACT, (WPARAM)hContact, (LPARAM)szGPGModuleName);
-
-	HookEvent(ME_DB_CONTACT_ADDED,AddContact);
-
-
-	return 0;
-}
-
-extern list<wstring> transfers;
-extern "C" int __declspec(dllexport) Unload(void)
-{
-//	for (HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
-//		DBDeleteContactSetting(hContact, szGPGModuleName, "KeyID_Prescense");
-	if(!transfers.empty())
-	{
-		for(list<wstring>::iterator p = transfers.begin(); p != transfers.end(); p++)
-			if(!(*p).empty())
-				DeleteFile((*p).c_str());
-	}
-	mir_free(inopentag);
-	mir_free(inclosetag);
-	mir_free(outopentag);
-	mir_free(outclosetag);
-	if(password)
-		mir_free(password);
-	return 0;
-}
diff --git a/plugins/new_gpg/src/jabber_account.cpp b/plugins/new_gpg/src/jabber_account.cpp
deleted file mode 100755
index 6a264a490d..0000000000
--- a/plugins/new_gpg/src/jabber_account.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-void JabberAccount::setAccountName(TCHAR *Name)
-{
-	AccountName = Name;
-}
-void JabberAccount::setAccountNumber(int Number)
-{
-	AccountNumber = Number;
-}
-void JabberAccount::setJabberInterface(IJabberInterface *JIf)
-{
-	JabberInterface = JIf;
-}
-void JabberAccount::setSendHandler(HJHANDLER hHandler)
-{
-	hSendHandler = hHandler;
-}
-void JabberAccount::setPrescenseHandler(HJHANDLER hHandler)
-{
-	hPrescenseHandler = hHandler;
-}
-void JabberAccount::setMessageHandler(HJHANDLER hHandler)
-{
-	hMessageHandler = hHandler;
-}
-
-
-TCHAR *JabberAccount::getAccountName()
-{
-	return AccountName;
-}
-int JabberAccount::getAccountNumber()
-{
-	return AccountNumber;
-}
-IJabberInterface *JabberAccount::getJabberInterface()
-{
-	return JabberInterface;
-}
-HJHANDLER JabberAccount::getSendHandler()
-{
-	return hSendHandler;
-}
-HJHANDLER JabberAccount::getPrescenseHandler()
-{
-	return hPrescenseHandler;
-}
-
-HJHANDLER JabberAccount::getMessageHandler()
-{
-	return hMessageHandler;
-}
-
-
-JabberAccount::JabberAccount()
-{
-	AccountName = NULL;
-	hSendHandler = INVALID_HANDLE_VALUE;
-	hPrescenseHandler = INVALID_HANDLE_VALUE;
-	hMessageHandler = INVALID_HANDLE_VALUE;
-	AccountNumber = -1;
-	JabberInterface = NULL;
-}
-JabberAccount::~JabberAccount()
-{
-	if(AccountName)
-		mir_free(AccountName);
-}
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/jabber_account.h b/plugins/new_gpg/src/jabber_account.h
deleted file mode 100755
index b643ed1636..0000000000
--- a/plugins/new_gpg/src/jabber_account.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef JABBER_ACCOUNT_H
-#define JABBER_ACCOUNT_H
-class JabberAccount 
-{
-public:
-	void setAccountName(TCHAR *Name);
-	void setAccountNumber(int Number);
-	void setJabberInterface(IJabberInterface *JIf);
-	void setSendHandler(HJHANDLER hHandler);
-	void setPrescenseHandler(HJHANDLER hHandler);
-	void setMessageHandler(HJHANDLER hHandler);
-
-	TCHAR *getAccountName();
-	int getAccountNumber();
-	IJabberInterface *getJabberInterface();
-	HJHANDLER getSendHandler();
-	HJHANDLER getPrescenseHandler();
-	HJHANDLER getMessageHandler();
-	~JabberAccount();
-	JabberAccount();
-private:
-	TCHAR *AccountName;
-	int AccountNumber;
-	IJabberInterface *JabberInterface;
-	HJHANDLER hSendHandler, hPrescenseHandler, hMessageHandler;
-};
-
-#endif
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/log.cpp b/plugins/new_gpg/src/log.cpp
deleted file mode 100755
index 7618914f66..0000000000
--- a/plugins/new_gpg/src/log.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright � 2010-2012 sss
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-
-logtofile& logtofile::operator<<(TCHAR *buf)
-{
-	extern bool bDebugLog;
-	if(bDebugLog)
-	{
-		log_mutex.lock();
-		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);
-		log<<toUTF8(buf);
-		log.close();
-		log_mutex.unlock();
-	}
-	return *this;
-}
-logtofile& logtofile::operator<<(char *buf)
-{
-	extern bool bDebugLog;
-	if(bDebugLog)
-	{
-		log_mutex.lock();
-		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);
-		log<<buf;
-		log.close();
-		log_mutex.unlock();
-	}
-	return *this;
-}
-logtofile& logtofile::operator<<(string buf)
-{
-	extern bool bDebugLog;
-	if(bDebugLog)
-	{
-		log_mutex.lock();
-		char *tmp = mir_utf8encode(buf.c_str());
-		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);
-		log<<tmp;
-		log.close();
-		log_mutex.unlock();
-		mir_free(tmp);
-	}
-	return *this;
-}
-logtofile& logtofile::operator<<(wstring buf)
-{
-	extern bool bDebugLog;
-	if(bDebugLog)
-	{
-		log_mutex.lock();
-		log.open(toUTF8(path).c_str(), std::ios::app |std::ios::ate);
-		log<<toUTF8(buf);
-		log.close();
-		log_mutex.unlock();
-	}
-	return *this;
-}
-void logtofile::init()
-{
-	extern bool bDebugLog;
-	if(bDebugLog)
-	{
-		if(path)
-			mir_free(path);
-		path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szLogFilePath", _T("C:\\GPGdebug.log"));
-	}
-}
-logtofile::logtofile()
-{
-	path = NULL;
-}
-logtofile::~logtofile()
-{
-	mir_free(path);
-}
diff --git a/plugins/new_gpg/src/log.h b/plugins/new_gpg/src/log.h
deleted file mode 100755
index ed1950947c..0000000000
--- a/plugins/new_gpg/src/log.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright � 2010-2012 sss
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef LOG_H
-#define LOG_H
-
-class logtofile
-{
-public:
-	logtofile& operator<<(TCHAR *buf);
-	logtofile& operator<<(char *buf);
-	logtofile& operator<<(string buf);
-	logtofile& operator<<(wstring buf);
-	void init();
-	~logtofile();
-	logtofile();
-private:
-	fstream log;
-	TCHAR *path;
-	boost::mutex log_mutex;
-};
-
-#endif
diff --git a/plugins/new_gpg/src/m_extraicons.h b/plugins/new_gpg/src/m_extraicons.h
deleted file mode 100755
index 589d040cef..0000000000
--- a/plugins/new_gpg/src/m_extraicons.h
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- Copyright (C) 2009 Ricardo Pescuma Domenecci
-
- This is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this file; see the file license.txt.  If
- not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
- */
-
-#ifndef __M_EXTRAICONS_H__
-#define __M_EXTRAICONS_H__
-
-#define MIID_EXTRAICONSSERVICE { 0x62d80749, 0xf169, 0x4592, { 0xb4, 0x4d, 0x3d, 0xd6, 0xde, 0x9d, 0x50, 0xc5 } }
-
-
-#define EXTRAICON_TYPE_CALLBACK 0 	// Similar to old clist callbacks, it fires 2 notifications
-#define EXTRAICON_TYPE_ICOLIB 1 	// This extra icon will use only icons registered with icolib. No callbacks
-									// needed. Just call MS_EXTRAICON_SET_ICON passing the name of the extraicon to set one.
-
-
-typedef struct {
-	int cbSize;
-	int type;						// One of EXTRAICON_TYPE_*
-	const char *name;				// Internal name. More than one plugin can register extra icons with the same name
-									// if both have the same type. In this case, both will be handled as one.
-									// This is usefull for ex for extra status, where icq and jabber can share the same slot.
-									// If the types are different the second one will be denied.
-	const char *description;		// [Translated by plugin] Description to be used in GUI
-	const char *descIcon;			// [Optional] Name of an icon registered with icolib to be used in GUI.
-
-	// If type == EXTRAICON_TYPE_CALLBACK this two must be set
-
-	// Callback to add icons to clist, calling MS_CLIST_EXTRA_ADD_ICON
-	// wParam=lParam=0
-	MIRANDAHOOK RebuildIcons;
-
-	// Callback to set the icon to clist, calling MS_CLIST_EXTRA_SET_ICON or MS_EXTRAICON_SET_ICON
-	// wParam = HANDLE hContact
-	// lParam = int slot
-	MIRANDAHOOK ApplyIcon;
-
-	// Other optional callbacks
-
-	// [Optional] Callback called when extra icon was clicked
-	// wParam = HANDLE hContact
-	// lParam = int slot
-	// param = onClickParam
-	MIRANDAHOOKPARAM OnClick;
-
-	LPARAM onClickParam;
-
-} EXTRAICON_INFO;
-
-
-// Register an extra icon
-// wParam = (EXTRAICON_INFO *) Extra icon info
-// lParam = 0
-// Return: (HANDLE) id of extra icon on success, 0 on error
-#define MS_EXTRAICON_REGISTER "ExtraIcon/Register"
-
-
-typedef struct {
-	int cbSize;
-	HANDLE hExtraIcon;				// Value returned by MS_EXTRAICON_REGISTER
-	HANDLE hContact;				// Contact to set the extra icon
-	union {							// The icon to be set. This depends on the type of the extra icon:
-		HANDLE hImage; 				// Value returned by MS_CLIST_EXTRA_ADD_ICON (if EXTRAICON_TYPE_CALLBACK)
-		const char *icoName;		// Name of the icon registered with icolib (if EXTRAICON_TYPE_ICOLIB)
-	};
-} EXTRAICON;
-
-// Set an extra icon icon
-// wParam = (EXTRAICON *) Extra icon
-// Return: 0 on success
-#define MS_EXTRAICON_SET_ICON "ExtraIcon/SetIcon"
-
-
-
-#ifndef _NO_WRAPPERS
-#ifdef __cplusplus
-
-static HANDLE ExtraIcon_Register(const char *name, const char *description, const char *descIcon,
-								 MIRANDAHOOK RebuildIcons,
-								 MIRANDAHOOK ApplyIcon,
-								 MIRANDAHOOKPARAM OnClick = NULL, LPARAM onClickParam = NULL)
-{
-	if (!ServiceExists(MS_EXTRAICON_REGISTER))
-		return NULL;
-
-	EXTRAICON_INFO ei = {0};
-	ei.cbSize = sizeof(ei);
-	ei.type = EXTRAICON_TYPE_CALLBACK;
-	ei.name = name;
-	ei.description = description;
-	ei.descIcon = descIcon;
-	ei.RebuildIcons = RebuildIcons;
-	ei.ApplyIcon = ApplyIcon;
-	ei.OnClick = OnClick;
-	ei.onClickParam = onClickParam;
-
-	return (HANDLE) CallService(MS_EXTRAICON_REGISTER, (WPARAM) &ei, 0);
-}
-
-static HANDLE ExtraIcon_Register(const char *name, const char *description, const char *descIcon = NULL,
-								 MIRANDAHOOKPARAM OnClick = NULL, LPARAM onClickParam = NULL)
-{
-	if (!ServiceExists(MS_EXTRAICON_REGISTER))
-		return NULL;
-
-	EXTRAICON_INFO ei = {0};
-	ei.cbSize = sizeof(ei);
-	ei.type = EXTRAICON_TYPE_ICOLIB;
-	ei.name = name;
-	ei.description = description;
-	ei.descIcon = descIcon;
-	ei.OnClick = OnClick;
-	ei.onClickParam = onClickParam;
-
-	return (HANDLE) CallService(MS_EXTRAICON_REGISTER, (WPARAM) &ei, 0);
-}
-
-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, HANDLE hImage)
-{
-	EXTRAICON ei = {0};
-	ei.cbSize = sizeof(ei);
-	ei.hExtraIcon = hExtraIcon;
-	ei.hContact = hContact;
-	ei.hImage = hImage;
-
-	return CallService(MS_EXTRAICON_SET_ICON, (WPARAM) &ei, 0);
-}
-
-static int ExtraIcon_SetIcon(HANDLE hExtraIcon, HANDLE hContact, const char *icoName)
-{
-	EXTRAICON ei = {0};
-	ei.cbSize = sizeof(ei);
-	ei.hExtraIcon = hExtraIcon;
-	ei.hContact = hContact;
-	ei.icoName = icoName;
-
-	return CallService(MS_EXTRAICON_SET_ICON, (WPARAM) &ei, 0);
-}
-
-#endif
-#endif
-
-
-#endif // __M_EXTRAICONS_H__
diff --git a/plugins/new_gpg/src/m_metacontacts.h b/plugins/new_gpg/src/m_metacontacts.h
deleted file mode 100755
index 9f348bd2c6..0000000000
--- a/plugins/new_gpg/src/m_metacontacts.h
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-
-Miranda IM: the free IM client for Microsoft* Windows*
-
-Copyright � 2004 Universite Louis PASTEUR, STRASBOURG.
-Copyright � 2004 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)
-
-This program is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#ifndef M_METACONTACTS_H__
-#define M_METACONTACTS_H__ 1
-
-#ifndef MIID_METACONTACTS
-#define MIID_METACONTACTS	{0xc0325019, 0xc1a7, 0x40f5, { 0x83, 0x65, 0x4f, 0x46, 0xbe, 0x21, 0x86, 0x3e}}
-#endif
-
-//get the handle for a contact's parent metacontact
-//wParam=(HANDLE)hSubContact
-//lParam=0
-//returns a handle to the parent metacontact, or null if this contact is not a subcontact
-#define MS_MC_GETMETACONTACT				"MetaContacts/GetMeta"
-
-//gets the handle for the default contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a handle to the default contact, or null on failure
-#define MS_MC_GETDEFAULTCONTACT				"MetaContacts/GetDefault"
-
-//gets the contact number for the default contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a DWORD contact number, or -1 on failure
-#define MS_MC_GETDEFAULTCONTACTNUM			"MetaContacts/GetDefaultNum"
-
-//gets the handle for the 'most online' contact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a handle to the 'most online' contact
-#define MS_MC_GETMOSTONLINECONTACT			"MetaContacts/GetMostOnline"
-
-//gets the number of subcontacts for a metacontact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns a DWORD representing the number of subcontacts for the given metacontact
-#define MS_MC_GETNUMCONTACTS				"MetaContacts/GetNumContacts"
-
-//gets the handle of a subcontact, using the subcontact's number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns a handle to the specified subcontact
-#define MS_MC_GETSUBCONTACT					"MetaContacts/GetSubContact"
-
-//sets the default contact, using the subcontact's contact number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns 0 on success
-#define MS_MC_SETDEFAULTCONTACTNUM			"MetaContacts/SetDefault"
-
-//sets the default contact, using the subcontact's handle
-//wParam=(HANDLE)hMetaContact
-//lParam=(HANDLE)hSubcontact
-//returns 0 on success
-#define MS_MC_SETDEFAULTCONTACT				"MetaContacts/SetDefaultByHandle"
-
-//forces the metacontact to send using a specific subcontact, using the subcontact's contact number
-//wParam=(HANDLE)hMetaContact
-//lParam=(DWORD)contact number
-//returns 0 on success
-#define MS_MC_FORCESENDCONTACTNUM			"MetaContacts/ForceSendContact"
-
-//forces the metacontact to send using a specific subcontact, using the subcontact's handle
-//wParam=(HANDLE)hMetaContact
-//lParam=(HANDLE)hSubcontact
-//returns 0 on success (will fail if 'force default' is in effect)
-#define MS_MC_FORCESENDCONTACT				"MetaContacts/ForceSendContactByHandle"
-
-//'unforces' the metacontact to send using a specific subcontact
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns 0 on success (will fail if 'force default' is in effect)
-#define MS_MC_UNFORCESENDCONTACT			"MetaContacts/UnforceSendContact"
-
-//'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact
-// overrides (and clears) 'force send' above, and will even force use of offline contacts
-// will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event
-//wParam=(HANDLE)hMetaContact
-//lParam=0
-//returns 1(true) or 0(false) representing new state of 'force default'
-#define MS_MC_FORCEDEFAULT					"MetaContacts/ForceSendDefault"
-
-// method to get state of 'force' for a metacontact
-// wParam=(HANDLE)hMetaContact
-// lParam= (DWORD)&contact_number or NULL
-// 
-// if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to,
-// or if none is in force, the value (DWORD)-1 will be copied
-// (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above)
-#define MS_MC_GETFORCESTATE					"MetaContacts/GetForceState"
-
-// fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set)
-// wParam=(HANDLE)hMetaContact
-// lParam=(HANDLE)hDefaultContact
-#define ME_MC_DEFAULTTCHANGED				"MetaContacts/DefaultChanged"
-
-// fired when a metacontact's subcontacts change (fired upon creation of metacontact, when contacts are added or removed, and when 
-//	contacts are reordered) - a signal to re-read metacontact data
-// wParam=(HANDLE)hMetaContact
-// lParam=0
-#define ME_MC_SUBCONTACTSCHANGED			"MetaContacts/SubcontactsChanged"
-
-// fired when a metacontact is forced to send using a specific subcontact
-// wParam=(HANDLE)hMetaContact
-// lParam=(HANDLE)hForceContact 
-#define ME_MC_FORCESEND						"MetaContacts/ForceSend"
-
-// fired when a metacontact is 'unforced' to send using a specific subcontact
-// wParam=(HANDLE)hMetaContact
-// lParam=0 
-#define ME_MC_UNFORCESEND					"MetaContacts/UnforceSend"
-
-// method to get protocol name - used to be sure you're dealing with a "real" metacontacts plugin :)
-// wParam=lParam=0
-#define MS_MC_GETPROTOCOLNAME				"MetaContacts/GetProtoName"
-
-
-// added 0.9.5.0 (22/3/05)
-// wParam=(HANDLE)hContact
-// lParam=0
-// convert a given contact into a metacontact
-#define MS_MC_CONVERTTOMETA					"MetaContacts/ConvertToMetacontact"
-
-// added 0.9.5.0 (22/3/05)
-// wParam=(HANDLE)hContact
-// lParam=(HANDLE)hMeta
-// add an existing contact to a metacontact
-#define MS_MC_ADDTOMETA						"MetaContacts/AddToMetacontact"
-
-// added 0.9.5.0 (22/3/05)
-// wParam=0
-// lParam=(HANDLE)hContact
-// remove a contact from a metacontact
-#define MS_MC_REMOVEFROMMETA				"MetaContacts/RemoveFromMetacontact"
-
-
-// added 0.9.13.2 (6/10/05)
-// wParam=(BOOL)disable
-// lParam=0
-// enable/disable the 'hidden group hack' - for clists that support subcontact hiding using 'IsSubcontact' setting
-// should be called once in the clist 'onmodulesloaded' event handler (which, since it's loaded after the db, will be called
-// before the metacontact onmodulesloaded handler where the subcontact hiding is usually done)
-#define MS_MC_DISABLEHIDDENGROUP			"MetaContacts/DisableHiddenGroup"
-
-#endif
diff --git a/plugins/new_gpg/src/main.cpp b/plugins/new_gpg/src/main.cpp
deleted file mode 100755
index 0c212d4e07..0000000000
--- a/plugins/new_gpg/src/main.cpp
+++ /dev/null
@@ -1,2305 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-
-
-#include "commonheaders.h"
-
-
-HWND hwndFirstRun = NULL, hwndSetDirs = NULL, hwndNewKey = NULL, hwndKeyGen = NULL, hwndSelectExistingKey = NULL;
-
-int itemnum = 0;
-
-HWND hwndList_g = NULL;
-BOOL CheckStateStoreDB(HWND hwndDlg, int idCtrl, const char* szSetting);
-
-static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-	HWND hwndList=GetDlgItem(hwndDlg, IDC_KEY_LIST);
-	hwndList_g = hwndList;
-	LVCOLUMN col = {0};
-	LVITEM item = {0};
-	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
-	TCHAR fp[16] = {0};
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		SetWindowPos(hwndDlg, 0, firstrun_rect.left, firstrun_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		SetWindowText(hwndDlg, TranslateW(_T("Set own key")));
-		col.pszText = _T("Key ID");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 50;
-		ListView_InsertColumn(hwndList, 0, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Email"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 1, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Name"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 250;
-		ListView_InsertColumn(hwndList, 2, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Creation date"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 3, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Key length"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 4, &col);
-		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_FULLROWSELECT);
-		int i = 1, iRow = 0;
-		{ 
-			item.mask = LVIF_TEXT;
-			item.iItem = i;
-			item.iSubItem = 0;
-			item.pszText = _T("");
-			{//parse gpg output
-				string out;
-				DWORD code;
-				pxResult result;
-				wstring::size_type p = 0, p2 = 0, stop = 0;
-				{
-					gpg_execution_params params;
-					wstring cmd = _T("--batch --list-secret-keys");
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					{
-						gpg_thread.~thread();
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						break;
-					}
-					if(result == pxNotFound)
-						break;
-				}
-				while(p != string::npos)
-				{
-					if((p = out.find("sec  ", p)) == string::npos)
-						break;
-					p += 5;
-					if(p < stop)
-						break;
-					stop = p;
-					p2 = out.find("/", p) - 1;
-					TCHAR *tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					item.pszText = tmp;
-					iRow = ListView_InsertItem(hwndList, &item);
-					ListView_SetItemText(hwndList, iRow, 4, tmp);
-					mir_free(tmp);
-					p2+=2;
-					p = out.find(" ", p2);
-					tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-					ListView_SetItemText(hwndList, iRow, 0, tmp);
-					mir_free(tmp);
-					p = out.find("uid  ", p);
-					p2 = out.find_first_not_of(" ", p+5);
-					p = out.find("<", p2);
-					tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-					ListView_SetItemText(hwndList, iRow, 2, tmp);
-					mir_free(tmp);
-					p++;
-					p2 = out.find(">", p);
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					ListView_SetItemText(hwndList, iRow, 1, tmp);
-					mir_free(tmp);
-					p = out.find("ssb  ", p2) + 6;
-					p = out.find(" ", p) + 1;
-					p2 = out.find("\n", p);
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p-1)).c_str());
-					ListView_SetItemText(hwndList, iRow, 3, tmp);
-					mir_free(tmp);
-					ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this
-					ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);
-					i++;
-				}
-			}
-		}
-		{
-			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_ADDSTRING, 0, (LPARAM)Translate("Default"));
-			int count = 0;
-			PROTOACCOUNT **accounts;
-			ProtoEnumAccounts(&count, &accounts);
-			for(int i = 0; i < count; i++)
-			{
-				if(StriStr(accounts[i]->szModuleName, "metacontacts"))
-					continue;
-				if(StriStr(accounts[i]->szModuleName, "weather"))
-					continue;
-				SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_ADDSTRING, 0, (LPARAM)accounts[i]->szModuleName);
-			}
-			SendMessageA(GetDlgItem(hwndDlg, IDC_ACCOUNT), CB_SELECTSTRING, 0, (LPARAM)Translate("Default"));
-			string keyinfo = Translate("key id");
-			keyinfo += ": ";
-			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
-			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
-			mir_free(keyid);
-			SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
-		}
-		return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_GENERATE_KEY:
-		  void ShowKeyGenDialog();
-		  ShowKeyGenDialog();
-		  break;
-	  case ID_OK:
-		  {
-			  ListView_GetItemText(hwndList, itemnum, 0, fp, 16);
-			  TCHAR *name = new TCHAR [64];
-			  ListView_GetItemText(hwndList, itemnum, 2, name, 64);
-			  {
-				  if(_tcschr(name, _T('(')))
-				  {
-					  wstring str = name;
-					  wstring::size_type p = str.find(_T("("))-1;
-					  _tcscpy(name, str.substr(0, p).c_str());
-				  }
-			  }
-			  string out;
-			  DWORD code;
-			  wstring cmd = _T("--batch -a --export ");
-			  cmd += fp;
-//			  cmd += _T("\"");
-			  gpg_execution_params params;
-			  pxResult result;
-			  params.cmd = &cmd;
-			  params.useless = "";
-			  params.out = &out;
-			  params.code = &code;
-			  params.result = &result;
-			  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			  {
-				  gpg_thread.~thread();
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				  break;
-			  }
-			  if(result == pxNotFound)
-				  break;
-			  string::size_type s = 0;
-			  while((s = out.find("\r", s)) != string::npos)
-			  {
-				  out.erase(s, 1);
-			  }
-			  {
-				  char buf[64];
-				  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
-				  if(!strcmp(buf, Translate("Default")))
-				  {
-					  DBWriteContactSettingString(NULL, szGPGModuleName, "GPGPubKey", out.c_str());
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, "KeyMainName", name);
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, "KeyID", fp);
-				  }
-				  else
-				  {
-					  char setting[64];
-					  strcpy(setting, buf);
-					  strcat(setting, "_GPGPubKey");
-					  DBWriteContactSettingString(NULL, szGPGModuleName, setting, out.c_str());
-					  strcpy(setting, buf);
-					  strcat(setting, "_KeyMainName");
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, setting, name);
-					  strcpy(setting, buf);
-					  strcat(setting, "_KeyID");
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, setting, fp);
-				  }
-			  }
-			  TCHAR passwd[64];
-			  GetDlgItemText(hwndDlg, IDC_KEY_PASSWORD, passwd, 64);
-			  if(passwd[0])
-			  {
-				  string dbsetting = "szKey_";
-				  char *keyid = mir_t2a(fp);
-				  dbsetting += keyid;
-				  mir_free(keyid);
-				  dbsetting += "_Password";
-				  DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), passwd);
-			  }
-			  {
-				  wstring keyinfo = TranslateT("Default private key id");
-				  keyinfo += _T(": ");
-				  keyinfo += (fp[0])?fp:_T("not set");
-				  extern HWND hwndCurKey_p;
-				  SetWindowText(hwndCurKey_p, keyinfo.c_str());
-			  }
-			  delete [] name;
-		  }
-		  bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");
-		  gpg_valid = isGPGValid();
-		  gpg_keyexist = isGPGKeyExist();
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case IDC_OTHER:
-		  {
-			  void ShowLoadPublicKeyDialog();
-			  extern map<int, HANDLE> user_data;
-			  extern int item_num;
-			  item_num = 0;		 //black magic here
-			  user_data[1] = 0;
-			  ShowLoadPublicKeyDialog();
-			  ListView_DeleteAllItems(hwndList);
-			  { 
-				  int i = 1, iRow = 0;
-				  item.mask = LVIF_TEXT;
-				  item.iItem = i;
-				  item.iSubItem = 0;
-				  item.pszText = _T("");
-				  {//parse gpg output
-					  string out;
-					  DWORD code;
-					  wstring::size_type p = 0, p2 = 0, stop = 0;
-					  {
-						  wstring cmd = _T("--batch --list-secret-keys");
-						  gpg_execution_params params;
-						  pxResult result;
-						  params.cmd = &cmd;
-						  params.useless = "";
-						  params.out = &out;
-						  params.code = &code;
-						  params.result = &result;
-						  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-						  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-						  {
-							  gpg_thread.~thread();
-							  TerminateProcess(params.hProcess, 1);
-							  params.hProcess = NULL;
-							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-							  break;
-						  }
-						  if(result == pxNotFound)
-							  break;
-					  }
-					  while(p != string::npos)
-					  {
-						  if((p = out.find("sec  ", p)) == string::npos)
-							  break;
-						  p += 5;
-						  if(p < stop)
-							  break;
-						  stop = p;
-						  p2 = out.find("/", p) - 1;
-						  TCHAR *tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-						  item.pszText = tmp;
-						  iRow = ListView_InsertItem(hwndList, &item);
-						  ListView_SetItemText(hwndList, iRow, 4, tmp);
-						  mir_free(tmp);
-						  p2+=2;
-						  p = out.find(" ", p2);
-						  tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-						  ListView_SetItemText(hwndList, iRow, 0, tmp);
-						  mir_free(tmp);
-						  p = out.find("uid  ", p);
-						  p2 = out.find_first_not_of(" ", p+5);
-						  p = out.find("<", p2);
-						  tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-						  ListView_SetItemText(hwndList, iRow, 2, tmp);
-						  mir_free(tmp);
-						  p++;
-						  p2 = out.find(">", p);
-						  tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-						  ListView_SetItemText(hwndList, iRow, 1, tmp);
-						  mir_free(tmp);
-						  p = out.find("ssb  ", p2) + 6;
-						  p = out.find(" ", p) + 1;
-						  p2 = out.find("\n", p);
-						  tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p-1)).c_str());
-						  ListView_SetItemText(hwndList, iRow, 3, tmp);
-						  mir_free(tmp);
-						  ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this
-						  ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);
-						  i++;
-					  }
-				  }
-			  }
-		  }
-		  break;
-	  case IDC_DELETE_KEY:
-		  ListView_GetItemText(hwndList, itemnum, 0, fp, 16);
-		  {
-			  string out;
-			  DWORD code;
-			  wstring cmd = _T("--batch --fingerprint ");
-			  cmd += fp;
-			  gpg_execution_params params;
-			  pxResult result;
-			  params.cmd = &cmd;
-			  params.useless = "";
-			  params.out = &out;
-			  params.code = &code;
-			  params.result = &result;			
-			  boost::thread *gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
-			  {
-				  delete gpg_thread;
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				  break;
-			  }
-			  if(result == pxNotFound)
-				  break;
-			  string::size_type s = out.find("Key fingerprint = ");
-			  s += strlen("Key fingerprint = ");
-			  string::size_type s2 = out.find("\n", s);
-			  TCHAR *fp = NULL;
-			  {
-				  string tmp = out.substr(s, s2-s-1).c_str();
-				  string::size_type p = 0;
-				  while((p = tmp.find(" ", p)) != string::npos)
-				  {
-					  tmp.erase(p, 1);
-				  }
-				  fp = mir_a2t(tmp.c_str());
-			  }
-			  cmd.clear();
-			  out.clear();
-			  cmd += _T("--batch --delete-secret-and-public-key --fingerprint ");
-			  cmd += fp;
-			  mir_free(fp);
-			  gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
-			  {
-				  delete gpg_thread;
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				  break;
-			  }
-			  if(result == pxNotFound)
-				  break;
-		  }
-		  {
-			  char buf[64];
-			  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
-			  if(!strcmp(buf, Translate("Default")))
-			  {
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "GPGPubKey");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "KeyID");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "KeyComment");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "KeyMainName");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "KeyMainEmail");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, "KeyType");
-			  }
-			  else
-			  {
-				  char setting[64];
-				  strcpy(setting, buf);
-				  strcat(setting, "_GPGPubKey");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-				  strcpy(setting, buf);
-				  strcat(setting, "_KeyMainName");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-				  strcpy(setting, buf);
-				  strcat(setting, "_KeyID");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-				  strcpy(setting, buf);
-				  strcat(setting, "_KeyComment");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-				  strcpy(setting, buf);
-				  strcat(setting, "_KeyMainEmail");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-				  strcpy(setting, buf);
-				  strcat(setting, "_KeyType");
-				  DBDeleteContactSetting(NULL, szGPGModuleName, setting);
-			  }
-		  }
-		  ListView_DeleteItem(hwndList, itemnum);
-		  break;
-	  case IDC_GENERATE_RANDOM:
-		  {
-			  wstring path;
-			  { //generating key file
-				  TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				  path = tmp;
-				  mir_free(tmp);
-				  path.append(_T("\\new_key"));
-				  wfstream f(path.c_str(), std::ios::out);
-				  if(!f.is_open())
-				  {
-					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
-					  break;
-				  }
-				  f<<"Key-Type: RSA";
-				  f<<"\n";
-				  f<<"Key-Length: 4096";
-				  f<<"\n";
-				  f<<"Subkey-Type: RSA";
-				  f<<"\n";
-				  f<<"Name-Real: ";
-				  f<<get_random(6).c_str();
-				  f<<"\n";
-				  f<<"Name-Email: ";
-				  f<<get_random(5).c_str();
-				  f<<"@";
-				  f<<get_random(5).c_str();
-				  f<<".";
-				  f<<get_random(3).c_str();
-				  f<<"\n";
-				  f.close();
-			  }
-			  { //gpg execution
-				  DWORD code;
-				  string out;
-				  wstring cmd;
-				  cmd += _T("--batch --yes --gen-key \"");
-				  cmd += path;
-				  cmd += _T("\"");
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &out;
-				  params.code = &code;
-				  params.result = &result;
-				  SetWindowTextA(GetDlgItem(hwndDlg, IDC_GENERATING_KEY), Translate("Generating new random key, please wait"));
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_GENERATE_KEY), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_OTHER), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE_KEY), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_LIST), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_GENERATE_RANDOM), 0);
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<": GPG execution timed out, aborted";
-					  break;
-				  }
-				  if(result == pxNotFound)
-					  break;
-
-				  DeleteFile(path.c_str());
-				  string::size_type p1 = 0;
-				  if((p1 = out.find("key ")) != string::npos)
-					  path = toUTF16(out.substr(p1+4, 8));
-				  else
-					  path.clear();
-			  }
-			  if(!path.empty())
-			  {
-				  string out;
-				  DWORD code;
-				  wstring cmd = _T("--batch -a --export ");
-				  cmd += path;
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &out;
-				  params.code = &code;
-				  params.result = &result;
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
-					  break;
-				  }
-				  if(result == pxNotFound)
-					  break;
-				  string::size_type s = 0;
-				  while((s = out.find("\r", s)) != string::npos)
-				  {
-					  out.erase(s, 1);
-				  }
-				  {
-					  char buf[64];
-					  GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
-					  if(!strcmp(buf, Translate("Default")))
-					  {
-						  DBWriteContactSettingString(NULL, szGPGModuleName, "GPGPubKey", out.c_str());
-						  DBWriteContactSettingTString(NULL, szGPGModuleName, "KeyID", fp);
-					  }
-					  else
-					  {
-						  char setting[64];
-						  strcpy(setting, buf);
-						  strcat(setting, "_GPGPubKey");
-						  DBWriteContactSettingString(NULL, szGPGModuleName, setting, out.c_str());
-						  strcpy(setting, buf);
-						  strcat(setting, "_KeyID");
-						  DBWriteContactSettingTString(NULL, szGPGModuleName, setting, fp);
-					  }
-				  }
-				  extern HWND hwndCurKey_p;
-				  SetWindowText(hwndCurKey_p, path.c_str());
-			  }
-		  }
-		  DestroyWindow(hwndDlg);
-		  break;
-		  		case IDC_ACCOUNT:
-			{
-				char buf[64];
-				GetDlgItemTextA(hwndDlg, IDC_ACCOUNT, buf, 63);
-				if(!strcmp(buf, Translate("Default")))
-				{
-					string keyinfo = Translate("key id");
-					keyinfo += ": ";
-					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
-					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
-					mir_free(keyid);
-					SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
-				}
-				else
-				{
-					string keyinfo = Translate("key id");
-					keyinfo += ": ";
-					char setting[64];
-					strcpy(setting, buf);
-					strcat(setting, "_KeyID");
-					char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
-					keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
-					mir_free(keyid);
-					SetDlgItemTextA(hwndDlg, IDC_KEY_ID, keyinfo.c_str());
-				}
-			}
-			break;
-
-	  }
-	  break;
-	}
-    
-  case WM_NOTIFY:
-    {
-		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
-		{
-			if(hdr->hdr.code == NM_CLICK)
-			{				
-				EnableWindow(GetDlgItem(hwndDlg, ID_OK), 1);
-				itemnum = hdr->iItem;
-			}
-		}
-/*		switch(LOWORD(wParam))
-		{
-		default:
-			break;
-		}; */
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  break;
-      } */
-	}
-	break;
-	case WM_CLOSE:
-		DestroyWindow(hwndDlg);
-		break;
-	case WM_DESTROY:
-		{
-			GetWindowRect(hwndDlg, &firstrun_rect);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowX", firstrun_rect.left);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "FirstrunWindowY", firstrun_rect.top);
-		}
-		hwndFirstRun = NULL;
-		break;
-
-  }
-
-  return FALSE;
-}
-
-void ShowFirstRunDialog();
-
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	TCHAR *tmp = NULL;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		TCHAR *path = new TCHAR [MAX_PATH];
-		bool gpg_exists = false, lang_exists = false;
-		{
-			char *mir_path = new char [MAX_PATH];
-			CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			SetCurrentDirectoryA(mir_path);
-			tmp = mir_a2t(mir_path);
-			mir_free(mir_path);
-			mir_realloc(path, (_tcslen(path)+128)*sizeof(TCHAR));
-			TCHAR *gpg_path = new TCHAR [MAX_PATH], *gpg_lang_path = new TCHAR [MAX_PATH];
-			_tcscpy(gpg_path, tmp);
-			_tcscat(gpg_path, _T("\\GnuPG\\gpg.exe"));
-			_tcscpy(gpg_lang_path, tmp);
-			_tcscat(gpg_lang_path, _T("\\GnuPG\\gnupg.nls\\en@quot.mo"));
-			mir_free(tmp);
-			if(_waccess(gpg_path, 0) != -1)
-			{
-				gpg_exists = true;
-				_tcscpy(path, _T("GnuPG\\gpg.exe"));
-			}
-			if(_waccess(gpg_lang_path, 0) != -1)
-				lang_exists = true;
-			if(gpg_exists && !lang_exists) //TODO: check gpg version
-				MessageBox(0, TranslateT("gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned."), TranslateT("Warning"), MB_OK);
-			mir_free(gpg_path);
-			mir_free(gpg_lang_path);
-		}
-		DWORD len = MAX_PATH;
-		if(!gpg_exists)
-		{
-			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", (SHGetValue(HKEY_CURRENT_USER, _T("Software\\GNU\\GnuPG"), _T("gpgProgram"), 0, path, &len) == ERROR_SUCCESS)?path:_T(""));
-			if(tmp[0])
-			{
-				char *mir_path = new char [MAX_PATH];
-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-				SetCurrentDirectoryA(mir_path);
-				delete [] mir_path;
-				if(_waccess(tmp, 0) == -1)
-				{
-					if(errno == ENOENT)
-						MessageBox(0, TranslateT("wrong gpg binary location found in system.\nplease choose another location"), TranslateT("Warning"), MB_OK);
-				}
-			}
-		}
-		else
-			tmp = mir_wstrdup(path);
-		delete [] path;
-		SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-		bool bad_version = false;
-		if(gpg_exists && lang_exists)
-		{
-			DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-			string out;
-			DWORD code;
-			wstring cmd = _T("--version");
-			gpg_execution_params params;
-			pxResult result;
-			params.cmd = &cmd;
-			params.useless = "";
-			params.out = &out;
-			params.code = &code;
-			params.result = &result;
-			gpg_valid = true;
-			boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			{
-				gpg_thread.~thread();
-				TerminateProcess(params.hProcess, 1);
-				params.hProcess = NULL;
-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-			}
-			gpg_valid = false;
-			DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
-			string::size_type p1 = out.find("(GnuPG) ");
-			if(p1 != string::npos)
-			{
-				p1 += strlen("(GnuPG) ");
-				if(out[p1] != '1')
-					bad_version = true;
-			}
-			else
-			{
-				bad_version = false;
-				MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-			}
-			if(bad_version)
-				MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-		}
-		mir_free(tmp);
-		if(!gpg_exists)
-		{
-			wstring path_ = _wgetenv(_T("APPDATA"));
-			path_ += _T("\\GnuPG");
-			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", (TCHAR*)path_.c_str());
-		}
-		SetDlgItemText(hwndDlg, IDC_HOME_DIR, !gpg_exists?tmp:_T("gpg"));
-		mir_free(tmp);
-		if(gpg_exists && lang_exists && !bad_version)
-			MessageBox(0, TranslateT("Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue."), TranslateT("Info"), MB_OK);
-		extern bool bIsMiranda09;
-		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), bIsMiranda09);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_SET_BIN_PATH:
-		  {
-			  GetFilePath(_T("Choose gpg.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables"));
-			  tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg.exe"));
-			  SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-			  char mir_path[MAX_PATH];
-			  char *atmp = mir_t2a(tmp);
-			  mir_free(tmp);
-			  CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			  char* p_path = NULL;
-			  if(StriStr(atmp, mir_path))
-			  {
-				  p_path = atmp + strlen(mir_path);
-				  tmp = mir_a2t(p_path);
-				  SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-			  }
-		  }
-		  break;
-	  case IDC_SET_HOME_DIR:
-		  {
-			  GetFolderPath(_T("Set home diractory"), "szHomePath");
-			  tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			  SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp);
-			  char mir_path[MAX_PATH];
-			  char *atmp = mir_t2a(tmp);
-			  mir_free(tmp);
-			  CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			  char* p_path = NULL;
-			  if(StriStr(atmp, mir_path))
-			  {
-				  p_path = atmp + strlen(mir_path);
-				  tmp = mir_a2t(p_path);
-				  SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp);
-			  }
-		  }
-		  break;
-      case ID_OK:
-        {
-		  TCHAR tmp[512];
-		  GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512);
-		  if(tmp[0])
-		  {
-			  char *mir_path = new char [MAX_PATH];
-			  CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			  SetCurrentDirectoryA(mir_path);
-			  delete [] mir_path;
-			  if(_waccess(tmp, 0) == -1)
-			  {
-				  if(errno == ENOENT)
-				  {
-					  MessageBox(0, TranslateT("gpg binary does not exists.\nplease choose another location"), TranslateT("Warning"), MB_OK);
-					  break;
-				  }
-			  }
-		  }
-		  else
-		  {
-			  MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
-			  break;
-		  }
-		  {
-			  bool bad_version = false;
-			  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-			  string out;
-			  DWORD code;
-			  wstring cmd = _T("--version");
-			  gpg_execution_params params;
-			  pxResult result;
-			  params.cmd = &cmd;
-			  params.useless = "";
-			  params.out = &out;
-			  params.code = &code;
-			  params.result = &result;
-			  gpg_valid = true;
-			  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			  {
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  gpg_thread.~thread();
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-			  }
-			  gpg_valid = false;
-			  DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
-			  string::size_type p1 = out.find("(GnuPG) ");
-			  if(p1 != string::npos)
-			  {
-				  p1 += strlen("(GnuPG) ");
-				  if(out[p1] != '1')
-					  bad_version = true;
-			  }
-			  else
-			  {
-				  bad_version = false;
-				  MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-			  }
-			  if(bad_version)
-				  MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-		  }
-		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-		  GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
-		  while(tmp[_tcslen(tmp)-1] == '\\')
-			  tmp[_tcslen(tmp)-1] = '\0';
-		  if(!tmp[0])
-		  {
-			  MessageBox(0, TranslateT("please set keyring's home directory"), TranslateT("Warning"), MB_OK);
-			  break;
-		  }
-		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
-		  {
-			  TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			  DWORD dwFileAttr = GetFileAttributes(path);
-			  if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-			  {
-				  dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
-				  SetFileAttributes(path, dwFileAttr);
-			  }
-			  mir_free(path);
-		  }
-		  gpg_valid = true;
-		  DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0);
-		  DestroyWindow(hwndDlg);
-		  ShowFirstRunDialog();
-        }
-		break;
-	  case IDC_GENERATE_RANDOM:
-        {
-			TCHAR tmp[512];
-			GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512);
-			if(tmp[0])
-			{
-				char *mir_path = new char [MAX_PATH];
-				CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-				SetCurrentDirectoryA(mir_path);
-				delete [] mir_path;
-				if(_waccess(tmp, 0) == -1)
-				{
-					if(errno == ENOENT)
-					{
-						MessageBox(0, TranslateT("gpg binary does not exists.\nplease choose another location"), TranslateT("Warning"), MB_OK);
-						break;
-					}
-				}
-			}
-			else
-			{
-				MessageBox(0, TranslateT("please choose gpg binary location"), TranslateT("Warning"), MB_OK);
-				break;
-			}
-			{
-				bool bad_version = false;
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-				string out;
-				DWORD code;
-				wstring cmd = _T("--version");
-				gpg_execution_params params;
-				pxResult result;
-				params.cmd = &cmd;
-				params.useless = "";
-				params.out = &out;
-				params.code = &code;
-				params.result = &result;
-				gpg_valid = true;
-				boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-				{
-					TerminateProcess(params.hProcess, 1);
-					params.hProcess = NULL;
-					gpg_thread.~thread();
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				}
-				gpg_valid = false;
-				DBDeleteContactSetting(NULL, szGPGModuleName, "szGpgBinPath");
-				string::size_type p1 = out.find("(GnuPG) ");
-				if(p1 != string::npos)
-				{
-					p1 += strlen("(GnuPG) ");
-					if(out[p1] != '1')
-						bad_version = true;
-				}
-				else
-				{
-					bad_version = false;
-					MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-				}
-				if(bad_version)
-					MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), TranslateT("Warning"), MB_OK);
-			}
-			DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-			GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
-			while(tmp[_tcslen(tmp)-1] == '\\')
-				tmp[_tcslen(tmp)-1] = '\0';
-			if(!tmp[0])
-			{
-				MessageBox(0, TranslateT("please set keyring's home directory"), TranslateT("Warning"), MB_OK);
-				break;
-			}
-			DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
-			{
-				TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				DWORD dwFileAttr = GetFileAttributes(path);
-				if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-				{
-					dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
-					SetFileAttributes(path, dwFileAttr);
-				}
-				mir_free(path);
-			}
-		}
-		  {
-			  wstring path;
-			  { //generating key file
-				  TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				  path = tmp;
-				  mir_free(tmp);
-				  path.append(_T("\\new_key"));
-				  wfstream f(path.c_str(), std::ios::out);
-				  if(!f.is_open())
-				  {
-					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
-					  break;
-				  }
-				  f<<"Key-Type: RSA";
-				  f<<"\n";
-				  f<<"Key-Length: 2048";
-				  f<<"\n";
-				  f<<"Subkey-Type: RSA";
-				  f<<"\n";
-				  f<<"Name-Real: ";
-				  f<<get_random(6).c_str();
-				  f<<"\n";
-				  f<<"Name-Email: ";
-				  f<<get_random(5).c_str();
-				  f<<"@";
-				  f<<get_random(5).c_str();
-				  f<<".";
-				  f<<get_random(3).c_str();
-				  f<<"\n";
-				  f.close();
-			  }
-			  { //gpg execution
-				  DWORD code;
-				  string out;
-				  wstring cmd;
-				  cmd += _T("--batch --yes --gen-key \"");
-				  cmd += path;
-				  cmd += _T("\"");
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &out;
-				  params.code = &code;
-				  params.result = &result;
-				  gpg_valid = true;
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<": GPG execution timed out, aborted";
-					  gpg_valid = false;
-					  break;
-				  }
-				  gpg_valid = false;
-				  if(result == pxNotFound)
-					  break;
-				  DeleteFile(path.c_str());
-				  string::size_type p1 = 0;
-				  if((p1 = out.find("key ")) != string::npos)
-					  path = toUTF16(out.substr(p1+4, 8));
-				  else
-					  path.clear();
-			  }
-			  if(!path.empty())
-			  {
-				  string out;
-				  DWORD code;
-				  wstring cmd = _T("--batch -a --export ");
-				  cmd += path;
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &out;
-				  params.code = &code;
-				  params.result = &result;
-				  gpg_valid = true;
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<"GPG execution timed out, aborted\n";
-					  gpg_valid = false;
-					  break;
-				  }
-				  gpg_valid = false;
-				  if(result == pxNotFound)
-					  break;
-				  string::size_type s = 0;
-				  while((s = out.find("\r", s)) != string::npos)
-				  {
-					  out.erase(s, 1);
-				  }
-				  DBWriteContactSettingString(NULL, szGPGModuleName, "GPGPubKey", out.c_str());
-				  DBWriteContactSettingTString(NULL, szGPGModuleName, "KeyID", path.c_str());
-				  extern HWND hwndCurKey_p;
-				  SetWindowText(hwndCurKey_p, path.c_str());
-			  }
-		  }
-		  bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");
-		  gpg_valid = true;
-		  DBWriteContactSettingByte(NULL, szGPGModuleName, "FirstRun", 0);
-		  DestroyWindow(hwndDlg);
-		  break;
-	  default:
-		break;
-      }
-      
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  break;
-      }*/
-	}
-    break;
-  case WM_CLOSE:
-	  DestroyWindow(hwndDlg);
-	  break;
-  case WM_DESTROY:
-	  hwndSetDirs = NULL;
-	  break;
-
-  }
-  return FALSE;
-}
-
-static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	extern HANDLE new_key_hcnt;
-	extern boost::mutex new_key_hcnt_mutex;
-	static HANDLE hContact = INVALID_HANDLE_VALUE;
-	void ImportKey();
-	TCHAR *tmp = NULL;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		hContact = new_key_hcnt;
-		new_key_hcnt_mutex.unlock();
-		SetWindowPos(hwndDlg, 0, new_key_rect.left, new_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-		SetDlgItemText(hwndDlg, IDC_MESSAGE, tmp[0]?TranslateT("There is existing key for contact, would you like to replace with new key ?"):TranslateT("New public key was received, do you want to import it?"));
-		EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT_AND_USE), DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)?0:1);
-		SetDlgItemText(hwndDlg, ID_IMPORT, tmp[0]?TranslateT("Replace"):TranslateT("Accept"));
-		mir_free(tmp);
-		tmp = new TCHAR [256];
-		_tcscpy(tmp, TranslateT("Received key from "));
-		_tcscat(tmp, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, (LPARAM)GCDNF_TCHAR));
-		SetDlgItemText(hwndDlg, IDC_KEY_FROM, tmp);
-		delete [] tmp;
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case ID_IMPORT:
-		  ImportKey();
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case IDC_IMPORT_AND_USE:
-		  ImportKey();
-		  DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-		  void setSrmmIcon(HANDLE hContact);
-		  void setClistIcon(HANDLE hContact);
-		  setSrmmIcon(hContact);
-		  setClistIcon(hContact);
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case IDC_IGNORE_KEY:
-		  DestroyWindow(hwndDlg);
-		  break;
-	  default:
-		break;
-      }
-      
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  break;
-      }*/
-	}
-    break;
-  case WM_CLOSE:
-	  DestroyWindow(hwndDlg);
-	  break;
-  case WM_DESTROY:
-	  {
-		  GetWindowRect(hwndDlg, &new_key_rect);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "NewKeyWindowX", new_key_rect.left);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "NewKeyWindowY", new_key_rect.top);
-	  }
-	  hwndNewKey = NULL;
-	  break;
-
-  }
-  return FALSE;
-}
-static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		SetWindowPos(hwndDlg, 0, key_gen_rect.left, key_gen_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		SetWindowText(hwndDlg, TranslateT("Key Generation dialog"));
-		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("RSA"), 0);
-		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEY_TYPE), _T("DSA"), 1);
-		SendDlgItemMessage(hwndDlg, IDC_KEY_TYPE, CB_SETCURSEL, (WPARAM)1, 0);
-		SetDlgItemInt(hwndDlg, IDC_KEY_EXPIRE_DATE, 0, 0);
-		SetDlgItemInt(hwndDlg, IDC_KEY_LENGTH, 4096, 0);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDCANCEL:
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case IDOK:
-		  {
-			  wstring path;
-			  { //data sanity checks
-				  TCHAR *tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*5);
-				  GetDlgItemText(hwndDlg, IDC_KEY_TYPE, tmp, 5);
-				  if(_tcslen(tmp) < 3)
-				  {
-					  mir_free(tmp); tmp = NULL;
-					  MessageBox(0, TranslateT("You must set encryption algorythm first"), TranslateT("Error"), MB_OK);
-					  break;
-				  }
-				  if(tmp)
-					  mir_free(tmp);
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*6);
-				  GetDlgItemText(hwndDlg, IDC_KEY_LENGTH, tmp, 5);
-				  int length = _ttoi(tmp);
-				  mir_free(tmp);
-				  if(length < 1024 || length > 4096)
-				  {
-					  MessageBox(0, TranslateT("Key length must be of length from 1024 to 4096 bits"), TranslateT("Error"), MB_OK);
-					  break;
-				  }
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*12);
-				  GetDlgItemText(hwndDlg, IDC_KEY_EXPIRE_DATE, tmp, 11);
-				  if(_tcslen(tmp) != 10 && tmp[0] != '0')
-				  {
-					  MessageBox(0, TranslateT("Invalid date"), TranslateT("Error"), MB_OK);
-					  mir_free(tmp);
-					  break;
-				  }
-				  mir_free(tmp);
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*128);
-				  GetDlgItemText(hwndDlg, IDC_KEY_REAL_NAME, tmp, 127);
-				  if(_tcslen(tmp) < 5)
-				  {
-					  MessageBox(0, TranslateT("Name must contain at least 5 characters"), TranslateT("Error"), MB_OK);
-					  mir_free(tmp);
-					  break;
-				  }
-				  else if (_tcschr(tmp, _T('(')) || _tcschr(tmp, _T(')')))
-				  {
-					  MessageBox(0, TranslateT("Name cannot contain '(' or ')'"), TranslateT("Error"), MB_OK);
-					  mir_free(tmp);
-					  break;
-				  }
-				  mir_free(tmp);
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*128);
-				  GetDlgItemText(hwndDlg, IDC_KEY_EMAIL, tmp, 128);
-				  if((_tcslen(tmp)) < 5 || (!_tcschr(tmp, _T('@'))) || (!_tcschr(tmp, _T('.'))))
-				  {
-					  MessageBox(0, TranslateT("Invalid Email"), TranslateT("Error"), MB_OK);
-					  mir_free(tmp);
-					  break;
-				  }
-				  mir_free(tmp);
-			  }		  
-			  { //generating key file
-				  TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				  char  *tmp2;// = mir_t2a(tmp);
-				  path = tmp;
-				  mir_free(tmp);
-				  //			  mir_free(tmp2);
-				  path.append(_T("\\new_key"));
-				  wfstream f(path.c_str(), std::ios::out);
-				  if(!f.is_open())
-				  {
-					  MessageBox(0, TranslateT("Failed to open file"), TranslateT("Error"), MB_OK);
-					  break;
-				  }
-				  f<<"Key-Type: ";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*5);
-				  GetDlgItemText(hwndDlg, IDC_KEY_TYPE, tmp, 5);
-				  tmp2 = mir_t2a(tmp);
-				  mir_free(tmp);
-				  char *subkeytype = (char*)mir_alloc(6);
-				  if(strstr(tmp2, "RSA"))
-					  strcpy(subkeytype, "RSA");
-				  else if(strstr(tmp2, "DSA")) //this is useless check for now, but it will be required if someone add another key types support
-					  strcpy(subkeytype, "ELG-E");
-				  f<<tmp2;
-				  mir_free(tmp2);
-				  f<<"\n";
-				  f<<"Key-Length: ";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*5); 
-				  GetDlgItemText(hwndDlg, IDC_KEY_LENGTH, tmp, 5);
-				  int length = _ttoi(tmp);
-				  mir_free(tmp);
-				  f<<length;
-				  f<<"\n";
-				  f<<"Subkey-Length: ";
-				  f<<length;
-				  f<<"\n";
-				  f<<"Subkey-Type: ";
-				  f<<subkeytype;
-				  mir_free(subkeytype);
-				  f<<"\n";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*64); //i hope this is enough for password
-				  GetDlgItemText(hwndDlg, IDC_KEY_PASSWD, tmp, 64);
-				  if(tmp[0])
-				  {
-					  f<<"Passphrase: ";
-					  tmp2 = mir_strdup(toUTF8(tmp).c_str());
-					  f<<tmp2;
-					  f<<"\n";
-					  mir_free(tmp2);
-				  }
-				  mir_free(tmp);
-				  f<<"Name-Real: ";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*128);
-				  GetDlgItemText(hwndDlg, IDC_KEY_REAL_NAME, tmp, 128);
-				  tmp2 = mir_strdup(toUTF8(tmp).c_str());
-				  f<<tmp2;
-				  mir_free(tmp2);
-				  mir_free(tmp);
-				  f<<"\n";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*512);
-				  GetDlgItemText(hwndDlg, IDC_KEY_COMMENT, tmp, 512);
-				  if(tmp[0])
-				  {
-					  tmp2 = mir_strdup(toUTF8(tmp).c_str());
-					  f<<"Name-Comment: ";
-					  f<<tmp2;
-					  f<<"\n";
-				  }
-				  mir_free(tmp2);
-				  mir_free(tmp);
-				  f<<"Name-Email: ";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*128);
-				  GetDlgItemText(hwndDlg, IDC_KEY_EMAIL, tmp, 128);
-				  tmp2 = mir_strdup(toUTF8(tmp).c_str());
-				  f<<tmp2;
-				  mir_free(tmp2);
-				  mir_free(tmp);
-				  f<<"\n";
-				  f<<"Expire-Date: ";
-				  tmp = (TCHAR*)mir_alloc(sizeof(TCHAR)*12);
-				  GetDlgItemText(hwndDlg, IDC_KEY_EXPIRE_DATE, tmp, 12);
-				  tmp2 = mir_strdup(toUTF8(tmp).c_str());
-				  f<<tmp2;
-				  mir_free(tmp2);
-				  mir_free(tmp);
-				  f<<"\n";
-				  f.close();
-			  }
-			  { //gpg execution
-				  DWORD code;
-				  string out;
-				  wstring cmd;
-				  cmd += _T("--batch --yes --gen-key \"");
-				  cmd += path;
-				  cmd += _T("\"");
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &out;
-				  params.code = &code;
-				  params.result = &result;
-				  SetWindowTextA(GetDlgItem(hwndDlg, IDC_GENERATING_TEXT), Translate("Generating new key, please wait..."));
-				  EnableWindow(GetDlgItem(hwndDlg, IDCANCEL), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDOK), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_TYPE), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_LENGTH), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_PASSWD), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_REAL_NAME), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_EMAIL), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_COMMENT), 0);
-				  EnableWindow(GetDlgItem(hwndDlg, IDC_KEY_EXPIRE_DATE), 0);
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::minutes(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					  break;
-				  }
-				  if(result == pxNotFound)
-					  break;
-			  }
-			  DeleteFile(path.c_str());
-			  DestroyWindow(hwndDlg);
-			{//parse gpg output
-				LVITEM item = {0};
-				int i = 1, iRow = 0;
-				item.mask = LVIF_TEXT;
-				item.iItem = i;
-				item.iSubItem = 0;
-				item.pszText = _T("");				
-				string out;
-				DWORD code;
-				string::size_type p = 0, p2 = 0, stop = 0;
-				{
-					wstring cmd = _T("--list-secret-keys");
-					gpg_execution_params params;
-					pxResult result;
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					{
-						gpg_thread.~thread();
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						break;
-					}
-					if(result == pxNotFound)
-						break;
-				}
-				ListView_DeleteAllItems(hwndList_g);
-				while(p != string::npos)
-				{
-					if((p = out.find("sec  ", p)) == string::npos)
-						break;
-					p += 5;
-					if(p < stop)
-						break;
-					stop = p;
-					p2 = out.find("/", p) - 1;
-					TCHAR *tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					item.pszText = tmp;
-					iRow = ListView_InsertItem(hwndList_g, &item);
-					ListView_SetItemText(hwndList_g, iRow, 4, tmp);
-					mir_free(tmp);
-					p2+=2;
-					p = out.find(" ", p2);
-					tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-					ListView_SetItemText(hwndList_g, iRow, 0, tmp);
-					mir_free(tmp);
-					p = out.find("uid  ", p);
-					p2 = out.find_first_not_of(" ", p+5);
-					p = out.find("<", p2);
-					tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-					ListView_SetItemText(hwndList_g, iRow, 2, tmp);
-					mir_free(tmp);
-					p++;
-					p2 = out.find(">", p);
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					ListView_SetItemText(hwndList_g, iRow, 1, tmp);
-					mir_free(tmp);
-					p = out.find("ssb  ", p2) + 6;
-					p = out.find(" ", p) + 1;
-					p2 = out.find("\n", p);
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p-1)).c_str());
-					ListView_SetItemText(hwndList_g, iRow, 3, tmp);
-					mir_free(tmp);
-					ListView_SetColumnWidth(hwndList_g, 0, LVSCW_AUTOSIZE);// not sure about this
-					ListView_SetColumnWidth(hwndList_g, 1, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList_g, 2, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList_g, 3, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList_g, 4, LVSCW_AUTOSIZE);
-					i++;
-				}
-			}
-		  }
-		  break;
-	  default:
-		break;
-      }
-      
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  break;
-      } */
-	}
-    break;
-  case WM_CLOSE:
-	  DestroyWindow(hwndDlg);
-	  break;
-  case WM_DESTROY:
-	  {
-		  GetWindowRect(hwndDlg, &key_gen_rect);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "KeyGenWindowX", key_gen_rect.left);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "KeyGenWindowY", key_gen_rect.top);
-	  }
-	  hwndKeyGen = NULL;
-	  break;
-
-  }
-  return FALSE;
-}
-
-int itemnum2 = 0;
-
-static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-	HWND hwndList=GetDlgItem(hwndDlg, IDC_EXISTING_KEY_LIST);
-	hwndList_g = hwndList;
-	LVCOLUMN col = {0};
-	LVITEM item = {0};
-	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
-	TCHAR id[16] = {0};
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		SetWindowPos(hwndDlg, 0, load_existing_key_rect.left, load_existing_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		col.pszText = _T("Key ID");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 50;
-		ListView_InsertColumn(hwndList, 0, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Email");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 1, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Name");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 250;
-		ListView_InsertColumn(hwndList, 2, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Creation date");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 3, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Expiration date");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 4, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = _T("Key length");
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 30;
-		ListView_InsertColumn(hwndList, 5, &col);
-		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_FULLROWSELECT);
-		int i = 1, iRow = 0;
-		{ 
-			item.mask = LVIF_TEXT;
-			item.iItem = i;
-			item.iSubItem = 0;
-			item.pszText = _T("");
-			{//parse gpg output
-				string out;
-				DWORD code;
-				string::size_type p = 0, p2 = 0, stop = 0;
-				{
-					wstring cmd = _T("--batch --list-keys");
-					gpg_execution_params params;
-					pxResult result;
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					{
-						gpg_thread.~thread();
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						break;
-					}
-					if(result == pxNotFound)
-						break;
-				}
-				while(p != string::npos)
-				{
-					if((p = out.find("pub  ", p)) == string::npos)
-						break;
-					p += 5;
-					if(p < stop)
-						break;
-					stop = p;
-					p2 = out.find("/", p) - 1;
-					TCHAR *tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					item.pszText = tmp;
-					iRow = ListView_InsertItem(hwndList, &item);
-					ListView_SetItemText(hwndList, iRow, 5, tmp);
-					mir_free(tmp);
-					p2+=2;
-					p = out.find(" ", p2);
-					tmp = mir_wstrdup(toUTF16(out.substr(p2,p-p2)).c_str());
-					ListView_SetItemText(hwndList, iRow, 0, tmp);
-					mir_free(tmp);
-					p++;
-					p2 = out.find("\n", p);
-					string::size_type p3 = out.substr(p, p2-p).find("[");
-					if(p3 != string::npos)
-					{
-						p3+=p;
-						p2 = p3;
-						p2--;
-						p3++;
-						p3+=strlen("expires: ");
-						string::size_type p4 = out.find("]", p3);
-						tmp = mir_wstrdup(toUTF16(out.substr(p3,p4-p3)).c_str());
-						ListView_SetItemText(hwndList, iRow, 4, tmp);
-						mir_free(tmp);
-					}
-					else
-						p2--;
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					ListView_SetItemText(hwndList, iRow, 3, tmp);
-					mir_free(tmp);
-					p = out.find("uid  ", p);
-					p+= strlen("uid ");
-					p2 = out.find("\n", p);
-					p3 = out.substr(p, p2-p).find("<");
-					if(p3 != string::npos)
-					{
-						p3+=p;
-						p2=p3;
-						p2--;
-						p3++;
-						string::size_type p4 = out.find(">", p3);
-						tmp = mir_wstrdup(toUTF16(out.substr(p3,p4-p3)).c_str());
-						ListView_SetItemText(hwndList, iRow, 1, tmp);
-						mir_free(tmp);
-					}
-					else
-						p2--;
-					p = out.find_first_not_of(" ", p);
-					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p)).c_str());
-					ListView_SetItemText(hwndList, iRow, 2, tmp);
-					mir_free(tmp);
-//					p = out.find("sub  ", p2) + 6;
-//					p = out.find(" ", p) + 1;
-//					p2 = out.find("\n", p);
-//					tmp = mir_wstrdup(toUTF16(out.substr(p,p2-p-1)).c_str());
-//					ListView_SetItemText(hwndList, iRow, 3, tmp);
-//					mir_free(tmp);
-					ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this
-					ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);
-					ListView_SetColumnWidth(hwndList, 5, LVSCW_AUTOSIZE);
-					i++;
-				}
-			}
-		}
-		return TRUE;
-    } 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDOK:
-		  {
-			  ListView_GetItemText(hwndList, itemnum2, 0, id, 16);
-			  extern HWND hPubKeyEdit;
-			  string out;
-			  DWORD code;
-			  wstring cmd = _T("--batch -a --export ");
-			  cmd += id;
-			  gpg_execution_params params;
-			  pxResult result;
-			  params.cmd = &cmd;
-			  params.useless = "";
-			  params.out = &out;
-			  params.code = &code;
-			  params.result = &result;
-			  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			  {
-				  gpg_thread.~thread();
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				  break;
-			  }
-			  if(result == pxNotFound)
-				  break;
-			  string::size_type s = 0;
-			  while((s = out.find("\r", s)) != string::npos)
-			  {
-				  out.erase(s, 1);
-			  }
-			  std::string::size_type p1 = 0, p2 = 0;
-			  p1 = out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----");
-			  if(p1 != std::string::npos)
-			  {
-				  p2 = out.find("-----END PGP PUBLIC KEY BLOCK-----", p1);
-				  if(p2 != std::string::npos)
-				  {
-					  p2 += strlen("-----END PGP PUBLIC KEY BLOCK-----");
-					  out = out.substr(p1, p2-p1);
-					  TCHAR *tmp = mir_a2t(out.c_str());
-					  SetWindowText(hPubKeyEdit, tmp);
-					  mir_free(tmp);
-				  }
-				  else
-					  MessageBox(NULL, TranslateT("Failed to export public key."), TranslateT("Error"), MB_OK);
-			  }
-			  else
-				  MessageBox(NULL, TranslateT("Failed to export public key."), TranslateT("Error"), MB_OK);
-//			  SetDlgItemText(hPubKeyEdit, IDC_PUBLIC_KEY_EDIT, tmp);
-		  }
-		  DestroyWindow(hwndDlg);
-		  break;
-	  case IDCANCEL:
-		  DestroyWindow(hwndDlg);
-		  break;
-      }
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
-		{
-			if(hdr->hdr.code == NM_CLICK)
-			{				
-				EnableWindow(GetDlgItem(hwndDlg, IDOK), 1);
-				itemnum2 = hdr->iItem;
-			}
-		}
-
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-          return TRUE;
-        }
-      }
-	}
-	break;
-	case WM_CLOSE:
-		DestroyWindow(hwndDlg);
-		break;
-	case WM_DESTROY:
-		{
-			GetWindowRect(hwndDlg, &load_existing_key_rect);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowX", load_existing_key_rect.left);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadExistingKeyWindowY", load_existing_key_rect.top);
-		}
-		hwndSelectExistingKey = NULL;
-		break;
-
-  }
-
-  return FALSE;
-}
-static BOOL CALLBACK DlgProcImportKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  extern HANDLE new_key_hcnt;
-  extern boost::mutex new_key_hcnt_mutex;
-  HANDLE hContact = INVALID_HANDLE_VALUE;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		hContact = new_key_hcnt;
-		new_key_hcnt_mutex.unlock();
-		SetWindowPos(hwndDlg, 0 , import_key_rect.left, import_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEYSERVER), _T("subkeys.pgp.net"), 0);
-		ComboBoxAddStringUtf(GetDlgItem(hwndDlg, IDC_KEYSERVER), _T("keys.gnupg.net"), 0);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_IMPORT:
-		  {
-			  string out;
-			  DWORD code;
-			  wstring cmd = _T(" --keyserver \"");
-			  TCHAR *server= new TCHAR [128];
-			  GetDlgItemText(hwndDlg, IDC_KEYSERVER, server, 128);
-			  cmd += server;
-			  delete [] server;
-			  cmd += _T("\" --recv-keys ");
-//			  char *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID_Prescense", "");
-//			  TCHAR *tmp2 = mir_a2t(tmp);
-//			  mir_free(tmp);
-			  cmd += toUTF16(hcontact_data[hContact].key_in_prescense);
-//			  mir_free(tmp2);
-			  gpg_execution_params params;
-			  pxResult result;
-			  params.cmd = &cmd;
-			  params.useless = "";
-			  params.out = &out;
-			  params.code = &code;
-			  params.result = &result;
-			  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			  {
-				  gpg_thread.~thread();
-				  TerminateProcess(params.hProcess, 1);
-				  params.hProcess = NULL;
-				  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-			  }
-			  MessageBoxA(0, out.c_str(), "GPG output", MB_OK);
-		  }
-		  break;
-	  default:
-		break;
-      }
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  break;
-      } */
-	}
-    break;
-  case WM_CLOSE:
-	  DestroyWindow(hwndDlg);
-	  break;
-  case WM_DESTROY:
-	  {
-		  GetWindowRect(hwndDlg, &import_key_rect);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "ImportKeyWindowX", import_key_rect.left);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "ImportKeyWindowY", import_key_rect.top);
-	  }
-	  break;
-
-  }
-  return FALSE;
-}
-
-
-extern HINSTANCE hInst;
-
-
-void ShowFirstRunDialog()
-{
-	if (hwndFirstRun == NULL)
-	{
-		hwndFirstRun = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIRST_RUN), NULL, (DLGPROC)DlgProcFirstRun);
-	}
-	SetForegroundWindow(hwndFirstRun);
-}
-
-
-void ShowSetDirsDialog()
-{
-	if (hwndSetDirs == NULL)
-	{
-		hwndSetDirs = CreateDialog(hInst, MAKEINTRESOURCE(IDD_BIN_PATH), NULL, (DLGPROC)DlgProcGpgBinOpts);
-	}
-	SetForegroundWindow(hwndSetDirs);
-}
-
-void ShowNewKeyDialog()
-{
-	hwndNewKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_NEW_KEY), NULL, (DLGPROC)DlgProcNewKeyDialog);
-	SetForegroundWindow(hwndNewKey);
-}
-
-void ShowKeyGenDialog()
-{
-	if (hwndKeyGen == NULL)
-	{
-		hwndKeyGen = CreateDialog(hInst, MAKEINTRESOURCE(IDD_KEY_GEN), NULL, (DLGPROC)DlgProcKeyGenDialog);
-	}
-	SetForegroundWindow(hwndKeyGen);
-}
-
-void ShowSelectExistingKeyDialog()
-{
-	if (hwndSelectExistingKey == NULL)
-	{
-		hwndSelectExistingKey = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LOAD_EXISTING_KEY), NULL, (DLGPROC)DlgProcLoadExistingKey);
-	}
-	SetForegroundWindow(hwndSelectExistingKey);
-}
-
-void ShowImportKeyDialog()
-{
-	CreateDialog(hInst, MAKEINTRESOURCE(IDD_IMPORT_KEY), NULL, (DLGPROC)DlgProcImportKeyDialog);
-}
-
-
-
-
-void FirstRun()
-{
-	DWORD pid = 0;
-	if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1))
-		return;
-	ShowSetDirsDialog();
-}
-
-void InitCheck()
-{
-	{//parse gpg output
-		gpg_valid = isGPGValid();
-		bool home_dir_access = false, temp_access = false;
-		TCHAR *home_dir = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-		std::wstring test_path = home_dir;
-		mir_free(home_dir);
-		test_path += _T("/");
-		test_path += toUTF16(get_random(13));
-		wfstream test_file;
-		test_file.open(test_path, std::ios::trunc | std::ios::out);
-		if(test_file.is_open() && test_file.good())
-		{
-			test_file<<_T("access_test\n");
-			if(test_file.good())
-				home_dir_access = true;
-			test_file.close();
-			DeleteFile(test_path.c_str());
-		}
-		home_dir = _tgetenv(_T("TEMP"));
-		test_path = home_dir;
-		test_path += _T("/");
-		test_path += toUTF16(get_random(13));
-		test_file.open(test_path, std::ios::trunc | std::ios::out);
-		if(test_file.is_open() && test_file.good())
-		{
-			test_file<<_T("access_test\n");
-			if(test_file.good())
-				temp_access = true;
-			test_file.close();
-			DeleteFile(test_path.c_str());
-		}
-		if(!home_dir_access || !temp_access || !gpg_valid)
-		{
-			char buf[4096];
-			strcpy(buf, gpg_valid?Translate("GPG binary is set and valid (this is good).\n"):Translate("GPG binary unset or invalid (plugin will not work).\n"));
-			strcat(buf, home_dir_access?Translate("Home dir write access granted (this is good).\n"):Translate("Home dir have not write access (plugin most probably will not work).\n"));
-			strcat(buf, temp_access?Translate("Temp dir write access granted (this is good).\n"):Translate("Temp dir have not write access (plugin should work, but may have some problems, filetransfers will not work)."));
-			if(!gpg_valid)
-				strcat(buf, Translate("\nGPG will be disabled until you solve this problems"));
-			MessageBoxA(0, buf, Translate("GPG plugin problems"), MB_OK);
-		}
-		if(!gpg_valid)
-			return;
-		gpg_keyexist = isGPGKeyExist();
-		string out;
-		DWORD code;
-		pxResult result;
-		wstring::size_type p = 0, p2 = 0, stop = 0;
-		{
-			gpg_execution_params params;
-			wstring cmd = _T("--batch --list-secret-keys");
-			params.cmd = &cmd;
-			params.useless = "";
-			params.out = &out;
-			params.code = &code;
-			params.result = &result;
-			boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			{
-				gpg_thread.~thread();
-				TerminateProcess(params.hProcess, 1);
-				params.hProcess = NULL;
-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				return;
-			}
-			if(result == pxNotFound)
-				return;
-		}
-		home_dir = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-		wstring tmp_dir = home_dir;
-		mir_free(home_dir);
-		tmp_dir += _T("\\tmp");
-		_wmkdir(tmp_dir.c_str());
-		string question = Translate("Your secret key whith id: ");
-		char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
-		char *key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-		void ShowFirstRunDialog();
-		if(!DBGetContactSettingByte(NULL, szGPGModuleName, "FirstRun", 1) && (!keyid[0] || !key[0]))
-		{
-			question = Translate("You have not set public key for gpg, it's recommended to do it.\nDo you want to do it now ?");
-			if(MessageBoxA(0, question.c_str(), Translate("Own public key warning"), MB_YESNO) == IDYES)
-				ShowFirstRunDialog();
-		}
-		if(out.find(keyid) == string::npos)
-		{
-			question += keyid;
-			question += Translate(" deleted from gpg secret keyring\nDo you want to set another key ?");
-			if(MessageBoxA(0, question.c_str(), Translate("Own secret key warning"), MB_YESNO) == IDYES)
-				ShowFirstRunDialog();
-		}
-		mir_free(keyid);
-		mir_free(key);
-	}
-	{
-		TCHAR *path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-		DWORD dwFileAttr = GetFileAttributes(path);
-		if (dwFileAttr != INVALID_FILE_ATTRIBUTES)
-		{
-			dwFileAttr &=~ FILE_ATTRIBUTE_READONLY;
-			SetFileAttributes(path, dwFileAttr);
-		}
-		mir_free(path);
-	}
-	extern bool bAutoExchange;
-	if(bAutoExchange)
-	{
-		int count = 0;
-		PROTOACCOUNT **accounts;
-		ProtoEnumAccounts(&count, &accounts);
-		ICQ_CUSTOMCAP cap;
-		cap.cbSize = sizeof(ICQ_CUSTOMCAP);
-		cap.hIcon = 0;
-		strcpy(cap.name, "GPG Key AutoExchange");
-		strcpy(cap.caps, "GPG AutoExchange");
-
-		for(int i = 0; i < count; i++)
-		{
-			char svc[64];
-			strcpy(svc, accounts[i]->szProtoName);
-			strcat(svc, PS_ICQ_ADDCAPABILITY);
-			if(ServiceExists(svc))
-				CallService(svc, 0, (LPARAM)&cap);
-		}
-	}
-}
-
-void ImportKey()
-{
-	extern wstring new_key;
-	extern HANDLE new_key_hcnt;
-	extern boost::mutex new_key_hcnt_mutex;
-	HANDLE hContact = new_key_hcnt;
-	new_key_hcnt_mutex.unlock();
-	bool for_all_sub = false;
-	if(metaIsProtoMetaContacts(hContact))
-		if(MessageBox(0, TranslateT("Do you want load key for all subcontacts ?"), TranslateT("Metacontact detected"), MB_YESNO) == IDYES)
-			for_all_sub = true;
-	if(metaIsProtoMetaContacts(hContact))
-	{
-		HANDLE hcnt = NULL;
-		if(for_all_sub)
-		{
-			int count = metaGetContactsNum(hContact);
-			for(int i = 0; i < count; i++)
-			{
-				hcnt = metaGetSubcontact(hContact, i);
-				if(hcnt)
-					DBWriteContactSettingTString(hcnt, szGPGModuleName, "GPGPubKey", new_key.c_str());
-			}
-		}
-		else
-			DBWriteContactSettingTString(metaGetMostOnline(hContact), szGPGModuleName, "GPGPubKey", new_key.c_str());
-	}
-	else
-		DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", new_key.c_str());
-	new_key.clear();
-	{ //gpg execute block
-		wstring cmd;
-		TCHAR tmp2[MAX_PATH] = {0};
-		TCHAR *ptmp;
-		string output;
-		DWORD exitcode;
-		{
-			ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			_tcscpy(tmp2, ptmp);
-			mir_free(ptmp);
-			_tcscat(tmp2, _T("\\"));
-			_tcscat(tmp2, _T("temporary_exported.asc"));
-			DeleteFile(tmp2);
-			wfstream f(tmp2, std::ios::out);
-			if(metaIsProtoMetaContacts(hContact))
-				ptmp = UniGetContactSettingUtf(metaGetMostOnline(hContact), szGPGModuleName, "GPGPubKey", _T(""));
-			else
-				ptmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-			wstring new_key = ptmp;
-			mir_free(ptmp);
-			f<<new_key.c_str();
-			f.close();
-			cmd += _T(" --batch ");
-			cmd += _T(" --import \"");
-			cmd += tmp2;
-			cmd += _T("\"");
-		}
-		gpg_execution_params params;
-		pxResult result;
-		params.cmd = &cmd;
-		params.useless = "";
-		params.out = &output;
-		params.code = &exitcode;
-		params.result = &result;
-		boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-		if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-		{
-			gpg_thread.~thread();
-			TerminateProcess(params.hProcess, 1);
-			params.hProcess = NULL;
-			debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-			return;
-		}
-		if(result == pxNotFound)
-			return;
-		{
-			if(metaIsProtoMetaContacts(hContact))
-			{
-				HANDLE hcnt = NULL;
-				if(for_all_sub)
-				{
-					int count = metaGetContactsNum(hContact);
-					for(int i = 0; i < count; i++)
-					{
-						hcnt = metaGetSubcontact(hContact, i);
-						if(hcnt)
-						{
-							char *tmp = NULL;
-							string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-							string::size_type s2 = output.find(":", s);
-							DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
-							s2+=2;
-							s = output.find("“", s2);
-							if(s == string::npos)
-							{
-								s = output.find("\"", s2);
-								s += 1;
-							}
-							else
-								s += 3;
-							if((s2 = output.find("(", s)) == string::npos)
-								s2 = output.find("<", s);
-							else if(s2 > output.find("<", s))
-								s2 = output.find("<", s);
-							tmp = new char [output.substr(s,s2-s-1).length()+1];
-							strcpy(tmp, output.substr(s,s2-s-1).c_str());
-							mir_utf8decode(tmp, 0);
-							DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainName", tmp);
-							mir_free(tmp);
-							if((s = output.find(")", s2)) == string::npos)
-								s = output.find(">", s2);
-							else if(s > output.find(">", s2))
-								s = output.find(">", s2);
-							s2++;
-							if(output[s] == ')')
-							{
-								tmp = new char [output.substr(s2,s-s2).length()+1];
-								strcpy(tmp, output.substr(s2,s-s2).c_str());
-								mir_utf8decode(tmp, 0);
-								DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyComment", tmp);
-								mir_free(tmp);
-								s+=3;
-								s2 = output.find(">", s);
-								tmp = new char [output.substr(s,s2-s).length()+1];
-								strcpy(tmp, output.substr(s,s2-s).c_str());
-								mir_utf8decode(tmp, 0);
-								DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainEmail", tmp);
-								mir_free(tmp);
-							}
-							else
-							{
-								tmp = new char [output.substr(s2,s-s2).length()+1];
-								strcpy(tmp, output.substr(s2,s-s2).c_str());
-								mir_utf8decode(tmp, 0);
-								DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-								mir_free(tmp);
-							}
-							DBDeleteContactSetting(hcnt, szGPGModuleName, "bAlwatsTrust");
-						}
-					}
-				}
-				else
-				{
-					char *tmp = NULL;
-					string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-					string::size_type s2 = output.find(":", s);
-					DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
-					s2+=2;
-					s = output.find("“", s2);
-					if(s == string::npos)
-					{
-						s = output.find("\"", s2);
-						s += 1;
-					}
-					else
-						s += 3;
-					if((s2 = output.find("(", s)) == string::npos)
-						s2 = output.find("<", s);
-					else if(s2 > output.find("<", s))
-						s2 = output.find("<", s);
-					tmp = new char [output.substr(s,s2-s-1).length()+1];
-					strcpy(tmp, output.substr(s,s2-s-1).c_str());
-					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainName", tmp);
-					mir_free(tmp);
-					if((s = output.find(")", s2)) == string::npos)
-						s = output.find(">", s2);
-					else if(s > output.find(">", s2))
-						s = output.find(">", s2);
-					s2++;
-					if(output[s] == ')')
-					{
-						tmp = new char [output.substr(s2,s-s2).length()+1];
-						strcpy(tmp, output.substr(s2,s-s2).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyComment", tmp);
-						mir_free(tmp);
-						s+=3;
-						s2 = output.find(">", s);
-						tmp = new char [output.substr(s,s2-s).length()+1];
-						strcpy(tmp, output.substr(s,s2-s).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", tmp);
-						mir_free(tmp);
-					}
-					else
-					{
-						tmp = new char [output.substr(s2,s-s2).length()+1];
-						strcpy(tmp, output.substr(s2,s-s2).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-						mir_free(tmp);
-					}
-					DBDeleteContactSetting(metaGetMostOnline(hContact), szGPGModuleName, "bAlwatsTrust");
-				}
-			}
-			else
-			{
-				char *tmp = NULL;
-				string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-				string::size_type s2 = output.find(":", s);
-				DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
-				s2+=2;
-				s = output.find("“", s2);
-				if(s == string::npos)
-				{
-					s = output.find("\"", s2);
-					s += 1;
-				}
-				else
-					s += 3;
-				if((s2 = output.find("(", s)) == string::npos)
-					s2 = output.find("<", s);
-				else if(s2 > output.find("<", s))
-					s2 = output.find("<", s);
-				tmp = new char [output.substr(s,s2-s-1).length()+1];
-				strcpy(tmp, output.substr(s,s2-s-1).c_str());
-				mir_utf8decode(tmp, 0);
-				DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", tmp);
-				mir_free(tmp);
-				if((s = output.find(")", s2)) == string::npos)
-					s = output.find(">", s2);
-				else if(s > output.find(">", s2))
-					s = output.find(">", s2);
-				s2++;
-				if(output[s] == ')')
-				{
-					tmp = new char [output.substr(s2,s-s2).length()+1];
-					strcpy(tmp, output.substr(s2,s-s2).c_str());
-					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(hContact, szGPGModuleName, "KeyComment", tmp);
-					mir_free(tmp);
-					s+=3;
-					s2 = output.find(">", s);
-					tmp = new char [output.substr(s,s2-s).length()+1];
-					strcpy(tmp, output.substr(s,s2-s).c_str());
-					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", tmp);
-					mir_free(tmp);
-				}
-				else
-				{
-					tmp = new char [output.substr(s2,s-s2).length()+1];
-					strcpy(tmp, output.substr(s2,s-s2).c_str());
-					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-					mir_free(tmp);
-				}
-				DBDeleteContactSetting(hContact, szGPGModuleName, "bAlwatsTrust");
-			}
-		}
-		ptmp = mir_wstrdup(toUTF16(output).c_str());
-		MessageBox(0, ptmp, _T(""), MB_OK);
-		mir_free(ptmp);
-		DeleteFile(tmp2);
-	}
-}
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/main.h b/plugins/new_gpg/src/main.h
deleted file mode 100755
index 23627a415a..0000000000
--- a/plugins/new_gpg/src/main.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#ifndef MAIN_H
-#define MAIN_H
-
-struct contact_data
-{
-	list<string>  msgs_to_send, msgs_to_pass;
-	string key_in_prescense;
-};
-
-extern std::map<HANDLE, contact_data> hcontact_data;
-extern bool bAutoExchange;
-extern RECT key_from_keyserver_rect, firstrun_rect, new_key_rect, key_gen_rect, load_key_rect, import_key_rect, key_password_rect, load_existing_key_rect;
-
-#endif
-
-
diff --git a/plugins/new_gpg/src/messages.cpp b/plugins/new_gpg/src/messages.cpp
deleted file mode 100755
index ba9a36c29c..0000000000
--- a/plugins/new_gpg/src/messages.cpp
+++ /dev/null
@@ -1,1058 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-
-wstring new_key;
-HANDLE new_key_hcnt = NULL;
-boost::mutex new_key_hcnt_mutex;
-bool _terminate = false;
-int returnNoError(HANDLE hContact);
-
-std::list<HANDLE> sent_msgs;
-
-int RecvMsgSvc_func(HANDLE hContact, std::wstring str, char *msg, DWORD flags, DWORD timestamp)
-{		
-	DWORD dbflags = DBEF_UTF;
-	{ //check for gpg related data
-		wstring::size_type s1 = wstring::npos, s2 = wstring::npos;
-
-		s1 = str.find(_T("-----BEGIN PGP MESSAGE-----"));
-		s2 = str.find(_T("-----END PGP MESSAGE-----"));
-		if((s2 != wstring::npos) && (s1 != wstring::npos))
-		{ //this is generic encrypted data block
-			void setSrmmIcon(HANDLE);
-			void setClistIcon(HANDLE);
-			bool isContactHaveKey(HANDLE hContact);
-			if(!isContactSecured(hContact))
-			{
-				debuglog<<time_str()<<": info: "<<"received message from: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with turned off encryption\n";
-				if(MessageBox(0, _T("We received encrypted message from contact with encryption turned off.\nDo you want turn on encryption for this contact ?"), _T("Warning"), MB_YESNO) == IDYES)
-				{
-					if(!isContactHaveKey(hContact))
-					{
-						void ShowLoadPublicKeyDialog();
-						extern map<int, HANDLE> user_data;
-						extern int item_num;
-						item_num = 0;		 //black magic here
-						user_data[1] = hContact;
-						ShowLoadPublicKeyDialog();
-					}
-					else
-					{
-						DBWriteContactSettingByte(metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact, szGPGModuleName, "GPGEncryption", 1);
-						setSrmmIcon(hContact);
-						setClistIcon(hContact);
-					}
-					if(isContactHaveKey(hContact))
-					{
-						DBWriteContactSettingByte(metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact, szGPGModuleName, "GPGEncryption", 1);
-						setSrmmIcon(hContact);
-						setClistIcon(hContact);
-					}
-				}
-				else if(MessageBox(0, _T("Do you want try to decrypt encrypted message ?"), _T("Warning"), MB_YESNO) == IDNO)
-				{
-					
-					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-					return 0;
-				}
-			}
-			{
-				wstring::size_type p = 0;
-				while((p = str.find(_T("\r"), p)) != wstring::npos)
-					str.erase(p, 1);
-			}
-			s2 += _tcslen(_T("-----END PGP MESSAGE-----"));
-			char *tmp = mir_t2a(str.substr(s1,s2-s1).c_str());
-			TCHAR *tmp2 = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			wstring path = tmp2;
-			wstring encfile = toUTF16(get_random(10));
-			wstring decfile = toUTF16(get_random(10));
-			path.append(_T("\\tmp\\"));
-			path.append(encfile);
-			DeleteFile(path.c_str());
-			fstream f(path.c_str(), std::ios::out);
-			while(!f.is_open())
-				f.open(path.c_str(), std::ios::out);
-			f<<tmp;
-			mir_free(tmp);
-			f.close();
-			{
-				extern TCHAR *password;
-				string out;
-				DWORD code;
-				wstring cmd;
-				cmd += _T("--batch ");
-				{
-					char *inkeyid = UniGetContactSettingUtf(metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact, szGPGModuleName, "InKeyID", "");
-					TCHAR *pass = NULL;
-					if(inkeyid[0])
-					{
-						string dbsetting = "szKey_";
-						dbsetting += inkeyid;
-						dbsetting += "_Password";
-						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
-						if(pass[0])
-							debuglog<<time_str()<<": info: found password in database for key id: "<<inkeyid<<", trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
-					}
-					else
-					{
-						pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
-						if(pass[0])
-							debuglog<<time_str()<<": info: found password for all keys in database, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
-					}
-					if(pass && pass[0])
-					{
-						cmd += _T("--passphrase \"");
-						cmd += pass;
-						cmd += _T("\" ");
-					}
-					else if(password && password[0])
-					{
-						debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with password\n";
-						cmd += _T("--passphrase \"");
-						cmd += password;
-						cmd += _T("\" ");
-					}
-					else
-						debuglog<<time_str()<<": info: passwords not found in database or memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" with out password\n";
-					mir_free(pass);
-					mir_free(inkeyid);
-				}
-				{
-					wstring path = tmp2;
-					path += _T("\\tmp\\");
-					path += decfile;
-					DeleteFile(path.c_str());
-				}
-				cmd += _T("--output \"");
-				cmd += tmp2;
-				cmd += _T("\\tmp\\");
-				cmd += decfile;
-				cmd += _T("\"");
-				cmd += _T(" -d -a \"");
-				cmd += path;
-				cmd += _T("\"");
-				gpg_execution_params params;
-				pxResult result;
-				params.cmd = &cmd;
-				params.useless = "";
-				params.out = &out;
-				params.code = &code;
-				params.result = &result;
-				boost::thread *gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-				if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
-				{
-					delete gpg_thread;
-					TerminateProcess(params.hProcess, 1);
-					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					DeleteFile(path.c_str());
-					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-					BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-					DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-					CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-					HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-					DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-					return 0;
-				}
-				if(result == pxNotFound)
-				{
-					DeleteFile(path.c_str());
-					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-					return 0;
-				}
-				//TODO: check gpg output for errors
-				_terminate = false;
-				while(out.find("public key decryption failed: bad passphrase") != string::npos)
-				{
-					debuglog<<time_str()<<": info: failed to decrypt messaage from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" password needed, trying to get one\n";
-					if(_terminate)
-					{
-						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-						HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-						break;
-					}
-					{ //save inkey id
-						string::size_type s = out.find(" encrypted with ");
-						s = out.find(" ID ", s);
-						s += strlen(" ID ");
-						string::size_type s2 = out.find(",",s);
-						DBWriteContactSettingString(metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact, szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
-					}
-					void ShowLoadKeyPasswordWindow();
-					new_key_hcnt_mutex.lock();
-					new_key_hcnt = hContact;
-					ShowLoadKeyPasswordWindow();
-					wstring cmd2 = cmd;
-					if(password)
-					{
-						debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";
-						wstring tmp = _T("--passphrase \"");
-						tmp += password;
-						tmp += _T("\" ");
-						cmd2.insert(0, tmp);
-					}
-					out.clear();
-					gpg_execution_params params;
-					pxResult result;
-					params.cmd = &cmd2;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					gpg_thread = gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
-					{
-						delete gpg_thread;
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						DeleteFile(path.c_str());
-						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-						HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-						return 0;
-					}
-					if(result == pxNotFound)
-					{
-						DeleteFile(path.c_str());
-						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-						return 0;
-					}
-					//TODO: check gpg output for errors
-				}
-				out.clear();
-				gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-				if(!gpg_thread->timed_join(boost::posix_time::seconds(10)))
-				{
-					delete gpg_thread;
-					TerminateProcess(params.hProcess, 1);
-					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					DeleteFile(path.c_str());
-					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-					BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-					DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-					CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-					HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-					DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-					return 0;
-				}
-				if(result == pxNotFound)
-				{
-					DeleteFile(path.c_str());
-					HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-				}
-				//TODO: check gpg output for errors
-				{
-					wstring tmp = tmp2;
-					tmp += _T("\\tmp\\");
-					tmp += encfile;
-					DeleteFile(tmp.c_str());
-				}
-				{
-					wstring tmp = tmp2;
-					tmp += _T("\\tmp\\");
-					tmp += decfile;
-					if(_waccess(tmp.c_str(), 0) == -1)
-					{
-						if(errno == ENOENT)
-						{
-							string str = msg;
-							str.insert(0, "Received unencrypted message:\n");
-							debuglog<<time_str()<<": info: Failed to decrypt GPG encrypted message.\n";
-							char *tmp = new char [str.length()+1];
-							strcpy(tmp, str.c_str());
-							HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-							BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-							DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-							CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-							HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-							DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-							mir_free(tmp);
-							return 0;
-						}
-					}
-				}
-				str.clear();
-				{
-					wstring path = tmp2;
-					mir_free(tmp2);
-					path += _T("\\tmp\\");
-					path += decfile;
-					fstream f(path.c_str(), std::ios::in | std::ios::ate | std::ios::binary);
-					if(f.is_open())
-					{
-						std::wifstream::pos_type size = f.tellg();
-						char *tmp = new char [(std::ifstream::pos_type)size+(std::ifstream::pos_type)1];
-						f.seekg(0, std::ios::beg);
-						f.read(tmp, size);
-						tmp[size] = '\0';
-						toUTF16(tmp);
-						str.append(toUTF16(tmp));
-						delete [] tmp;
-						f.close();
-						DeleteFile(path.c_str());
-					}
-					if(str.empty())
-					{
-						string str = msg;
-						str.insert(0, "Failed to decrypt GPG encrypted message.\nMessage body for manual decryption:\n");
-						debuglog<<time_str()<<": info: Failed to decrypt GPG encrypted message.\n";
-						char *tmp = mir_strdup(str.c_str());
-						HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-						BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-						CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"Unable to decrypt PGP encrypted message");
-						HistoryLog(hContact, db_event("Error message sent", 0, 0, DBEF_SENT));
-						DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-						mir_free(tmp);
-						return 0;
-					}
-					else
-					{
-						if(bAppendTags)
-						{
-							str.insert(0, inopentag);
-							str.append(inclosetag);
-						}
-						if(metaIsSubcontact(hContact))
-						{
-							char *msg = mir_strdup(toUTF8(str).c_str());
-							HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags|DBEF_READ));
-							HistoryLog(metaGetContact(hContact), db_event(msg, timestamp, 0, dbflags));
-							mir_free(msg);
-							return 0;
-						}
-						char *tmp = mir_strdup(toUTF8(str).c_str());
-						HistoryLog(hContact, db_event(tmp, timestamp, 0, dbflags));
-						mir_free(tmp);
-						return 0;
-					}
-				}
-			}
-		}
-	}
-	if(DBGetContactSettingByte(metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact, szGPGModuleName, "GPGEncryption", 0))
-	{
-		if(metaIsSubcontact(hContact))
-		{
-			HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags|DBEF_READ));
-			HistoryLog(metaGetContact(hContact), db_event(msg, timestamp, 0, dbflags));
-			return 0;
-		}
-		HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags|DBEF_READ));
-		return 0;
-	}
-	HistoryLog(hContact, db_event(msg, timestamp, 0, dbflags));
-	return 0;
-}
-
-int RecvMsgSvc(WPARAM w, LPARAM l)
-{
-	CCSDATA *ccs = (CCSDATA*)l;
-	if (!ccs)
-		return CallService(MS_PROTO_CHAINRECV, w, l);
-	PROTORECVEVENT *pre = (PROTORECVEVENT*)(ccs->lParam);
-	if (!pre)
-		return CallService(MS_PROTO_CHAINRECV, w, l);
-	char *msg = pre->szMessage;
-	if (!msg)
-		return CallService(MS_PROTO_CHAINRECV, w, l);
-	wstring str = toUTF16(msg);
-	wstring::size_type s1 = wstring::npos, s2 = wstring::npos;
-	DWORD dbflags = DBEF_UTF;
-	if((str.find(_T("-----PGP KEY RESPONSE-----")) != wstring::npos) && !metaIsProtoMetaContacts(ccs->hContact))
-	{
-		s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-		s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-		if(s1 != wstring::npos && s2 != wstring::npos)
-		{
-			s2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			DBWriteContactSettingTString(ccs->hContact, szGPGModuleName, "GPGPubKey", str.substr(s1,s2-s1).c_str());
-			DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
-			{ //gpg execute block
-				wstring cmd;
-				TCHAR tmp2[MAX_PATH] = {0};
-				TCHAR *ptmp;
-				string output;
-				DWORD exitcode;
-				{
-					ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-					_tcscpy(tmp2, ptmp);
-					mir_free(ptmp);
-					_tcscat(tmp2, _T("\\"));
-					_tcscat(tmp2, _T("temporary_exported.asc"));
-					DeleteFile(tmp2);
-					wfstream f(tmp2, std::ios::out);
-					while(!f.is_open())
-						f.open(tmp2, std::ios::out);
-					ptmp = UniGetContactSettingUtf(ccs->hContact, szGPGModuleName, "GPGPubKey", _T(""));
-					wstring new_key = ptmp;
-					mir_free(ptmp);
-					f<<new_key.c_str();
-					f.close();
-					cmd += _T(" --batch ");
-					cmd += _T(" --import \"");
-					cmd += tmp2;
-					cmd += _T("\"");
-				}
-				gpg_execution_params params;
-				pxResult result;
-				params.cmd = &cmd;
-				params.useless = "";
-				params.out = &output;
-				params.code = &exitcode;
-				params.result = &result;
-				boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-				{
-					gpg_thread.~thread();
-					TerminateProcess(params.hProcess, 1);
-					params.hProcess = NULL;
-					debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					return 1;
-				}
-				if(result == pxNotFound)
-					return 1;
-				//TODO: check gpg output for errors
-				{
-					char *tmp = NULL;
-					string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-					string::size_type s2 = output.find(":", s);
-					DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyID", output.substr(s,s2-s).c_str());
-					s2+=2;
-					s = output.find("“", s2);
-					if(s == string::npos)
-					{
-						s = output.find("\"", s2);
-						s += 1;
-					}
-					else
-						s += 3;
-					if((s2 = output.find("(", s)) == string::npos)
-						s2 = output.find("<", s);
-					else if(s2 > output.find("<", s))
-						s2 = output.find("<", s);
-					tmp = (char*)mir_alloc(output.substr(s,s2-s-1).length()+1);
-					strcpy(tmp, output.substr(s,s2-s-1).c_str());
-					mir_utf8decode(tmp, 0);
-					DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyMainName", tmp);
-					mir_free(tmp);
-					if((s = output.find(")", s2)) == string::npos)
-						s = output.find(">", s2);
-					else if(s > output.find(">", s2))
-						s = output.find(">", s2);
-					s2++;
-					if(output[s] == ')')
-					{
-						tmp = (char*)mir_alloc(output.substr(s2,s-s2).length()+1);
-						strcpy(tmp, output.substr(s2,s-s2).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyComment", tmp);
-						mir_free(tmp);
-						s+=3;
-						s2 = output.find(">", s);
-						tmp = (char*)mir_alloc(output.substr(s,s2-s).length()+1);
-						strcpy(tmp, output.substr(s,s2-s).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyMainEmail", tmp);
-						mir_free(tmp);
-					}
-					else
-					{
-						tmp = (char*)mir_alloc(output.substr(s2,s-s2).length()+1);
-						strcpy(tmp, output.substr(s2,s-s2).c_str());
-						mir_utf8decode(tmp, 0);
-						DBWriteContactSettingString(ccs->hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-						mir_free(tmp);
-					}
-					DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "bAlwatsTrust", 1);
-					void setSrmmIcon(HANDLE);
-					void setClistIcon(HANDLE);
-					setSrmmIcon(ccs->hContact);
-					setClistIcon(ccs->hContact);
-					if(metaIsSubcontact(ccs->hContact))
-					{
-						setSrmmIcon(metaGetContact(ccs->hContact));
-						setClistIcon(metaGetContact(ccs->hContact));
-						HistoryLog(metaGetContact(ccs->hContact), "PGP Encryption turned on by key autoexchange feature");
-					}
-					HistoryLog(ccs->hContact, "PGP Encryption turned on by key autoexchange feature");
-				}
-				}
-				return 1;
-			}
-		}
-		if((str.find(_T("-----END PGP PUBLIC KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----")) != wstring::npos))
-		{
-			s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-		}
-		else if((str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----END PGP PRIVATE KEY BLOCK-----")) != wstring::npos))
-		{
-			s2 = str.find(_T("-----END PGP PRIVATE KEY BLOCK-----"));
-			s1 = str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
-		}
-		if((s2 != wstring::npos) && (s1 != wstring::npos))
-		{  //this is public key
-			if(metaIsProtoMetaContacts(ccs->hContact))
-			{
-				HistoryLog(ccs->hContact, db_event(msg, 0, 0, dbflags));
-				return 0;
-			}
-			debuglog<<time_str()<<": info: "<<"received key from: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ccs->hContact, GCDNF_TCHAR)<<"\n";
-			s1 = 0;
-			while((s1 = str.find(_T("\r"), s1)) != wstring::npos)
-			{
-				str.erase(s1, 1);
-			}
-			void ShowNewKeyDialog();
-			if((str.find(_T("-----END PGP PUBLIC KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----")) != wstring::npos))
-			{
-				s2 = str.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-				s1 = str.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-				s2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			}
-			else if((str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----")) != wstring::npos) && (str.find(_T("-----END PGP PRIVATE KEY BLOCK-----")) != wstring::npos))
-			{
-				s2 = str.find(_T("-----END PGP PRIVATE KEY BLOCK-----"));
-				s1 = str.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
-				s2 += _tcslen(_T("-----END PGP PRIVATE KEY BLOCK-----"));
-			}
-			new_key.append(str.substr(s1,s2-s1));
-			new_key_hcnt_mutex.lock();
-			new_key_hcnt = ccs->hContact;
-			ShowNewKeyDialog();
-			HistoryLog(ccs->hContact, db_event(msg, 0, 0, dbflags));
-			return 0;
-		}
-		if(bAutoExchange && strstr(msg, "-----PGP KEY REQUEST-----") && gpg_valid && gpg_keyexist)
-		{
-			char *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-			if(tmp[0])
-			{
-				DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 0);
-				string str = "-----PGP KEY RESPONSE-----";
-				str.append(tmp);
-				CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)str.c_str());
-				DBWriteContactSettingByte(ccs->hContact, szGPGModuleName, "GPGEncryption", 1);
-			}
-			mir_free(tmp);
-			return returnNoError(ccs->hContact);
-		}
-		else if(!isContactHaveKey(ccs->hContact) && bAutoExchange && gpg_valid && gpg_keyexist)
-		{
-			LPSTR proto = (LPSTR)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
-			DWORD uin = DBGetContactSettingDword(ccs->hContact, proto, "UIN", 0);
-			if(uin)
-			{
-				char *proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
-				char svc[64];
-				strcpy(svc, proto);
-				strcat(svc, PS_ICQ_CHECKCAPABILITY);
-				if(ServiceExists(svc))
-				{
-					ICQ_CUSTOMCAP cap = {0};
-					strcpy(cap.caps, "GPG AutoExchange");
-					if(CallService(svc, (WPARAM)ccs->hContact, (LPARAM)&cap))
-					{
-						CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)"-----PGP KEY REQUEST-----");
-						return returnNoError(ccs->hContact);
-					}
-				}
-			}
-			else
-			{
-				TCHAR *jid = UniGetContactSettingUtf(ccs->hContact, proto, "jid", _T(""));
-				if(jid[0])
-				{
-					extern list <JabberAccount*> Accounts;
-					list<JabberAccount*>::iterator end = Accounts.end();
-					for(list<JabberAccount*>::iterator p = Accounts.begin(); p != end; p++)
-					{
-						TCHAR *caps = (*p)->getJabberInterface()->Net()->GetResourceFeatures(jid);
-						if(caps)
-						{
-							wstring str;
-							for(int i =0;;i++)
-							{
-								str.push_back(caps[i]);
-								if(caps[i] == '\0')
-									if(caps[i+1] == '\0')
-										break;
-							}
-							mir_free(caps);
-							if(str.find(_T("GPG_Key_Auto_Exchange:0")) != string::npos)
-							{
-								CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)0, (LPARAM)"-----PGP KEY REQUEST-----");
-								return returnNoError(ccs->hContact);
-							}
-						}
-					}
-				}
-			}
-		}
-		if(!(strstr(msg, "-----BEGIN PGP MESSAGE-----") && strstr(msg, "-----END PGP MESSAGE-----")))
-			return CallService(MS_PROTO_CHAINRECV, w, l);
-		boost::thread *thr = new boost::thread(boost::bind(RecvMsgSvc_func, ccs->hContact, str, msg, ccs->wParam, pre->timestamp));
-		return returnNoError(ccs->hContact);
-}
-
-int SendMsgSvc_func(HANDLE hContact, char *msg, DWORD flags)
-{
-	wstring str;
-	bool isansi = false;
-	DWORD dbflags = 0;
-	if(flags & PREF_UTF)
-		dbflags |= DBEF_UTF;
-	if(!metaIsSubcontact(hContact))
-		str = toUTF16(msg);
-	else
-	{//workaround ...
-		wchar_t *tmp = mir_utf8decodeW(msg);
-		if(!tmp)
-		{
-			tmp = mir_a2t(msg);
-			isansi = true;
-		}
-		str.append(tmp);
-		mir_free(tmp);
-	}
-	if(bStripTags && bAppendTags)
-	{
-		std::wstring::size_type p;
-		for(p = str.find(inopentag); p != std::wstring::npos; p = str.find(inopentag))
-			str.erase(p, _tcslen(inopentag));
-		for(p = str.find(inclosetag); p != std::wstring::npos; p = str.find(inclosetag))
-			str.erase(p, _tcslen(inclosetag));
-		for(p = str.find(outopentag); p != std::wstring::npos; p = str.find(outopentag))
-			str.erase(p, _tcslen(outopentag));
-		for(p = str.find(outclosetag); p != std::wstring::npos; p = str.find(outclosetag))
-			str.erase(p, _tcslen(outclosetag));
-	}
-/*	for(std::wstring::size_type i = str.find(_T("\r\n")); i != std::wstring::npos; i = str.find(_T("\r\n"), i+1))
-		str.replace(i, 2, _T("\n")); */
-	string out;
-	DWORD code;
-	wstring cmd;
-	wstring file = toUTF16(get_random(10));
-	wstring path;
-	extern bool bJabberAPI, bIsMiranda09;
-	char *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", "");
-	if(!tmp[0])
-	{
-		mir_free(tmp);
-		HistoryLog(hContact, db_event("Failed to encrypt message with GPG", 0,0, DBEF_SENT));
-		hcontact_data[hContact].msgs_to_pass.push_back("Failed to encrypt message with GPG");
-		mir_free(msg);
-		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-	}
-	if(!bJabberAPI || !bIsMiranda09) //force jabber to handle encrypted message by itself
-		cmd += _T("--comment \"\" --no-version ");
-	if(DBGetContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 0))
-		cmd += _T("--trust-model always ");
-	cmd += _T("--batch --yes -e -a -t -r ");
-	TCHAR *tmp2 = mir_a2t(tmp);
-	mir_free(tmp);
-	cmd += tmp2;
-	mir_free(tmp2);
-	cmd += _T(" \"");
-	tmp2 = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-	path.append(tmp2);
-	cmd += tmp2;
-	mir_free(tmp2);
-	cmd += _T("\\tmp\\");
-	cmd += file;
-	path.append(_T("\\tmp\\"));
-	path += file;
-	cmd += _T("\"");
-	{
-		char *tmp;
-		tmp = mir_strdup(toUTF8(str).c_str());
-		fstream f(path.c_str(), std::ios::out);
-		while(!f.is_open())
-			f.open(path.c_str(), std::ios::out);
-		f<<tmp;
-		mir_free(tmp);
-		f.close();
-	}
-	gpg_execution_params params;
-	pxResult result;
-	params.cmd = &cmd;
-	params.useless = "";
-	params.out = &out;
-	params.code = &code;
-	params.result = &result;
-	boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-	if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-	{
-		gpg_thread.~thread();
-		TerminateProcess(params.hProcess, 1);
-		params.hProcess = NULL;
-		debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-		mir_free(msg);
-		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-	}
-	if(result == pxNotFound)
-	{
-		mir_free(msg);
-		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-	}
-	//TODO: check gpg output for errors
-	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
-	{
-		out.clear();
-		if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
-		{
-			DBWriteContactSettingByte(hContact, szGPGModuleName, "bAlwaysTrust", 1);
-			cmd.insert(0, _T("--trust-model always "));
-			gpg_execution_params params;
-			pxResult result;
-			params.cmd = &cmd;
-			params.useless = "";
-			params.out = &out;
-			params.code = &code;
-			params.result = &result;
-			boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-			if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-			{
-				gpg_thread.~thread();
-				TerminateProcess(params.hProcess, 1);
-				params.hProcess = NULL;
-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				mir_free(msg);
-				return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-			}
-			if(result == pxNotFound)
-			{
-				mir_free(msg);
-				return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-			}
-			//TODO: check gpg output for errors
-		}
-		else
-		{
-			mir_free(msg);
-			return 0;
-		}
-	}
-	if(out.find("usage: ") != string::npos)
-	{
-		MessageBox(0, _T("Something wrong, gpg does not understand us, aborting encryption."), _T("Warning"), MB_OK);
-		DeleteFile(path.c_str());
-		mir_free(msg);
-		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-	}
-	DeleteFile(path.c_str());
-	path.append(_T(".asc"));
-	wfstream f(path.c_str(), std::ios::in | std::ios::ate | std::ios::binary);
-	while(!f.is_open())
-		f.open(path.c_str(), std::ios::in | std::ios::ate | std::ios::binary);
-	str.clear();
-	if(f.is_open())
-	{
-		std::wifstream::pos_type size = f.tellg();
-		TCHAR *tmp = new TCHAR [(std::ifstream::pos_type)size+(std::ifstream::pos_type)1];
-		f.seekg(0, std::ios::beg);
-		f.read(tmp, size);
-		tmp[size]= '\0';
-		str.append(tmp);
-		delete [] tmp;
-		f.close();
-		DeleteFile(path.c_str());
-	}
-	if(str.empty())
-	{
-		HistoryLog(hContact, db_event("Failed to encrypt message with GPG", 0,0, DBEF_SENT));
-		hcontact_data[hContact].msgs_to_pass.push_back("Failed to encrypt message with GPG");
-		debuglog<<time_str()<<": info: Failed to encrypt message with GPG\n";
-		mir_free(msg);
-		return CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)msg);
-	}
-	string str_event = msg;
-	if(bAppendTags)
-	{
-		str_event.insert(0, toUTF8(outopentag));
-		str_event.append(toUTF8(outclosetag));
-	}
-	if(metaIsSubcontact(hContact))
-	{
-		hcontact_data[metaGetContact(hContact)].msgs_to_pass.push_back(str_event);
-		debuglog<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"is subcontact of"<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)metaGetContact(hContact), GCDNF_TCHAR)<<"\n";
-		debuglog<<time_str()<<": adding event to metacontact: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)metaGetContact(hContact), GCDNF_TCHAR)<<" on send message.\n";
-		HistoryLog(metaGetContact(hContact), db_event((char*)str_event.c_str(), 0,0, DBEF_SENT|dbflags));
-	}
-	hcontact_data[hContact].msgs_to_pass.push_back(str_event);
-	debuglog<<time_str()<<": adding event to contact: "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" on send message.\n";
-	HistoryLog(hContact, db_event((char*)str_event.c_str(), 0,0, dbflags|DBEF_SENT));
-	if(!(flags & PREF_UTF))
-		flags |= PREF_UTF; 
-	sent_msgs.push_back((HANDLE)CallContactService(hContact, PSS_MESSAGE, (WPARAM)flags, (LPARAM)toUTF8(str).c_str()));
-	mir_free(msg);
-	return 0;
-}
-
-int SendMsgSvc(WPARAM w, LPARAM l)
-{
-	CCSDATA *ccs = (CCSDATA*)l;
-	if (!ccs)
-		return CallService(MS_PROTO_CHAINSEND, w, l);
-	char *msg = mir_strdup((char*)(ccs->lParam));
-	if (!msg)
-	{
-		mir_free(msg);
-		return CallService(MS_PROTO_CHAINSEND, w, l);
-	}
-	if(strstr(msg,"-----BEGIN PGP MESSAGE-----"))
-		return CallService(MS_PROTO_CHAINSEND, w, l);
-	if(!isContactHaveKey(ccs->hContact))
-	{
-		if(bAutoExchange && !strstr(msg, "-----PGP KEY REQUEST-----") && !strstr(msg, "-----BEGIN PGP PUBLIC KEY BLOCK-----") && gpg_valid)
-		{
-			void send_encrypted_msgs_thread(HANDLE hContact);
-			LPSTR proto = (LPSTR)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
-			DWORD uin = DBGetContactSettingDword(ccs->hContact, proto, "UIN", 0);
-			if(uin)
-			{
-				char *proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)ccs->hContact, 0);
-				char svc[64];
-				strcpy(svc, proto);
-				strcat(svc, PS_ICQ_CHECKCAPABILITY);
-
-				if(ServiceExists(svc))
-				{
-					ICQ_CUSTOMCAP cap = {0};
-					strcpy(cap.caps, "GPG AutoExchange");
-					if(CallService(svc, (WPARAM)ccs->hContact, (LPARAM)&cap))
-					{
-						CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)ccs->wParam, (LPARAM)"-----PGP KEY REQUEST-----");
-						hcontact_data[ccs->hContact].msgs_to_send.push_back(msg);
-						boost::thread *thr = new boost::thread(boost::bind(send_encrypted_msgs_thread, ccs->hContact));
-						mir_free(msg);
-						return returnNoError(ccs->hContact);
-					}
-				}
-			}
-			else
-			{
-				TCHAR *jid = UniGetContactSettingUtf(ccs->hContact, proto, "jid", _T(""));
-				if(jid[0])
-				{
-					extern list <JabberAccount*> Accounts;
-					list<JabberAccount*>::iterator end = Accounts.end();
-					for(list<JabberAccount*>::iterator p = Accounts.begin(); p != end; p++)
-					{
-						TCHAR *caps = (*p)->getJabberInterface()->Net()->GetResourceFeatures(jid);
-						if(caps)
-						{
-							wstring str;
-							for(int i=0;;i++)
-							{
-								str.push_back(caps[i]);
-								if(caps[i] == '\0')
-									if(caps[i+1] == '\0')
-										break;
-							}
-							mir_free(caps);
-							if(str.find(_T("GPG_Key_Auto_Exchange:0")) != string::npos)
-							{
-								CallContactService(ccs->hContact, PSS_MESSAGE, (WPARAM)ccs->wParam, (LPARAM)"-----PGP KEY REQUEST-----");
-								hcontact_data[ccs->hContact].msgs_to_send.push_back(msg);
-								boost::thread *thr = new boost::thread(boost::bind(send_encrypted_msgs_thread, ccs->hContact));
-								mir_free(msg);
-								return returnNoError(ccs->hContact);
-							}
-						}
-					}
-				}
-			}
-		}
-		else
-		{
-			mir_free(msg);
-			return CallService(MS_PROTO_CHAINSEND, w, l);
-		}
-	}
-	if(!isContactSecured(ccs->hContact) || metaIsProtoMetaContacts(ccs->hContact))
-	{
-		mir_free(msg);
-		return CallService(MS_PROTO_CHAINSEND, w, l);
-	}
-	boost::thread *thr = new boost::thread(boost::bind(SendMsgSvc_func, ccs->hContact, msg, (DWORD)ccs->wParam));
-	return returnNoError(ccs->hContact);
-}
-
-boost::mutex event_processing_mutex;
-
-int HookSendMsg(WPARAM w, LPARAM l)
-{
-	if(!l)
-		return 0;
-	DBEVENTINFO * dbei = (DBEVENTINFO*)l;
-	if(dbei->eventType != EVENTTYPE_MESSAGE)
-		return 0;
-	if(dbei->flags & DBEF_SENT)
-	{
-		if(strstr((char*)dbei->pBlob, "-----BEGIN PGP MESSAGE-----") || strstr((char*)dbei->pBlob, "-----PGP KEY RESPONSE-----") || strstr((char*)dbei->pBlob, "-----PGP KEY REQUEST-----") || strstr((char*)dbei->pBlob, "-----PGP KEY RESPONSE-----")) //our service data, can be double added by metacontacts e.t.c.
-			return 1;
-	}
-	HANDLE hContact = (HANDLE)w;
-	if(isContactSecured(hContact) && (dbei->flags & DBEF_SENT)) //aggressive outgoing events filtering
-	{
-		if(!hcontact_data[hContact].msgs_to_pass.empty())
-		{
-			event_processing_mutex.lock();
-			std::list<string>::iterator end = hcontact_data[hContact].msgs_to_pass.end();
-			for(std::list<string>::iterator i = hcontact_data[hContact].msgs_to_pass.begin(); i != end; ++i)
-			{
-				if(!strcmp((*i).c_str(), (char*)dbei->pBlob))
-				{
-					hcontact_data[hContact].msgs_to_pass.erase(i);
-					debuglog<<time_str()<<": event message: \""<<(char*)dbei->pBlob<<"\" passed event filter, contact "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<", message is in allowed list\n";
-					event_processing_mutex.unlock();
-					return 0;
-				}
-			}
-			event_processing_mutex.unlock();
-		}
-		if(metaIsProtoMetaContacts(hContact) && !isContactSecured(metaGetMostOnline(hContact)))
-			return 0;
-		return 1;
-	}
-	if(!isContactSecured(hContact))
-	{
-		debuglog<<time_str()<<": event message: \""<<(char*)dbei->pBlob<<"\" passed event filter, contact "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<" is unsecured\n";
-		return 0;
-	}
-	if(!(dbei->flags & DBEF_SENT) && metaIsProtoMetaContacts((HANDLE)w))
-	{
-		char tmp[29];
-		strncpy(tmp, (char*)dbei->pBlob, 27);
-		tmp[28] = '\0';
-		if(strstr(tmp, "-----BEGIN PGP MESSAGE-----"))
-			return 1;
-	}
-	return 0;
-}
-
-
-static BOOL CALLBACK DlgProcKeyPassword(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	char *inkeyid = NULL;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		inkeyid = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "InKeyID", "");
-		new_key_hcnt_mutex.unlock();
-		TCHAR *tmp = NULL;
-
-		SetWindowPos(hwndDlg, 0, key_password_rect.left, key_password_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		TranslateDialogDefault(hwndDlg);
-		string questionstr = "Please enter password for key with ID: ";
-		questionstr += inkeyid;
-		SetDlgItemTextA(hwndDlg, IDC_KEYID, questionstr.c_str());
-		EnableWindow(GetDlgItem(hwndDlg, IDC_DEFAULT_PASSWORD), 0);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-      case IDOK:
-        {
-			TCHAR tmp[64];
-			GetDlgItemText(hwndDlg, IDC_KEY_PASSWORD, tmp, 64);
-			if(tmp[0])
-			{
-				extern TCHAR *password;
-				if(IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD))
-				{
-					if(inkeyid && inkeyid[0] && !IsDlgButtonChecked(hwndDlg, IDC_DEFAULT_PASSWORD))
-					{
-						string dbsetting = "szKey_";
-						dbsetting += inkeyid;
-						dbsetting += "_Password";
-						DBWriteContactSettingTString(NULL, szGPGModuleName, dbsetting.c_str(), tmp);
-					}
-					else
-						DBWriteContactSettingTString(NULL, szGPGModuleName, "szKeyPassword", tmp);
-				}
-				if(password)
-					delete [] password;
-				password = new TCHAR [_tcslen(tmp)+1];
-				_tcscpy(password, tmp);
-			}
-			mir_free(tmp);
-			mir_free(inkeyid);
-			DestroyWindow(hwndDlg);
-          break;
-        }
-	  case IDCANCEL:
-		  mir_free(inkeyid);
-		  _terminate = true;
-		  DestroyWindow(hwndDlg);
-		  break;
-	  default:
-		break;
-      }
-      
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-/*      switch (((LPNMHDR)lParam)->code)
-      {
-	  default:
-		  EnableWindow(GetDlgItem(hwndDlg, IDC_DEFAULT_PASSWORD), IsDlgButtonChecked(hwndDlg, IDC_SAVE_PASSWORD)?1:0);
-		  break;
-      }*/
-	}
-    break;
-  case WM_CLOSE:
-	  mir_free(inkeyid);
-	  DestroyWindow(hwndDlg);
-	  break;
-  case WM_DESTROY:
-	  {
-		  GetWindowRect(hwndDlg, &key_password_rect);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "PasswordWindowX", key_password_rect.left);
-		  DBWriteContactSettingDword(NULL, szGPGModuleName, "PasswordWindowY", key_password_rect.top);
-	  }
-	  break;
-
-  }
-  return FALSE;
-}
-
-void ShowLoadKeyPasswordWindow()
-{
-	extern HINSTANCE hInst;
-	DialogBox(hInst, MAKEINTRESOURCE(IDD_KEY_PASSWD), NULL, (DLGPROC)DlgProcKeyPassword);
-}
diff --git a/plugins/new_gpg/src/metacontacts.cpp b/plugins/new_gpg/src/metacontacts.cpp
deleted file mode 100755
index 1abc2aaeac..0000000000
--- a/plugins/new_gpg/src/metacontacts.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright � 2010-2012 SecureIM developers (baloo and others), sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-extern bool bMetaContacts;
-
-bool metaIsProtoMetaContacts(HANDLE hContact)
-{
-    if(bMetaContacts) {
-    	LPSTR proto = (LPSTR)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-    	if( proto && strcmp(proto,"MetaContacts")==0 ) {
-    		return true;
-    	}
-    }
-    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)
-		if(metaIsSubcontact(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 false;
-}
-
-
-HANDLE metaGetMostOnline(HANDLE hContact) 
-{
-
-    if(bMetaContacts)
-		if(metaIsProtoMetaContacts(hContact))
-			return (HANDLE)CallService(MS_MC_GETMOSTONLINECONTACT,(WPARAM)hContact,0);
-    return NULL;
-}
-HANDLE metaGetDefault(HANDLE hContact) 
-{
-
-    if(bMetaContacts)
-		if(metaIsProtoMetaContacts(hContact))
-			return (HANDLE)CallService(MS_MC_GETDEFAULTCONTACT,(WPARAM)hContact,0);
-    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)
-		return (HANDLE)CallService(MS_MC_GETSUBCONTACT, (WPARAM)hContact, (LPARAM)num);
-	return 0;
-}
-
-
diff --git a/plugins/new_gpg/src/metacontacts.h b/plugins/new_gpg/src/metacontacts.h
deleted file mode 100755
index 8b8873edcc..0000000000
--- a/plugins/new_gpg/src/metacontacts.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-bool metaIsProtoMetaContacts(HANDLE hContact);
-bool metaIsDefaultSubContact(HANDLE hContact) ;
-HANDLE metaGetContact(HANDLE hContact);
-bool metaIsSubcontact(HANDLE hContact);
-HANDLE metaGetMostOnline(HANDLE hContact);
-HANDLE metaGetDefault(HANDLE hContact);
-DWORD metaGetContactsNum(HANDLE hContact);
-HANDLE metaGetSubcontact(HANDLE hContact, int num);
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/options.cpp b/plugins/new_gpg/src/options.cpp
deleted file mode 100755
index f03879c48b..0000000000
--- a/plugins/new_gpg/src/options.cpp
+++ /dev/null
@@ -1,1387 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#include "commonheaders.h"
-
-extern HINSTANCE hInst;
-
-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
-BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef)
-{
-	BOOL state = DBGetContactSettingByte(NULL, szGPGModuleName, szSetting, bDef);
-	CheckDlgButton(hwndDlg, idCtrl, state);
-	return state;
-}
-
-BOOL CheckStateStoreDB(HWND hwndDlg, int idCtrl, const char* szSetting)
-{
-	BOOL state = IsDlgButtonChecked(hwndDlg, idCtrl);
-	DBWriteContactSettingByte(NULL, szGPGModuleName, szSetting, (BYTE)state);
-	return state;
-}
-
-
-int GpgOptInit(WPARAM wParam,LPARAM lParam)
-{
-	OPTIONSDIALOGPAGE odp = { 0 };
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);
-	odp.pszTitle = szGPGModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "Main";
-	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgOpts;
-	Options_AddPage(wParam, &odp);
-
-	ZeroMemory(&odp, sizeof(odp));
-
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);
-	odp.pszTitle = szGPGModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "GnuPG Variables";
-	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgBinOpts;
-	Options_AddPage(wParam, &odp);
-
-	ZeroMemory(&odp, sizeof(odp));
-
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_MESSAGES);
-	odp.pszTitle = szGPGModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "Messages";
-	odp.flags=ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts;
-	Options_AddPage(wParam, &odp);
-
-	ZeroMemory(&odp, sizeof(odp));
-
-	odp.cbSize = sizeof(odp);
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);
-	odp.pszTitle = szGPGModuleName;
-	odp.pszGroup = "Services";
-	odp.pszTab = "Advanced";
-	odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY;
-	odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts;
-	Options_AddPage(wParam, &odp);
-
-	return 0;
-}
-
-map<int, HANDLE> user_data;
-
-int item_num = 0;
-HWND hwndList_p = NULL;
-HWND hwndCurKey_p = NULL;
-
-void ShowLoadPublicKeyDialog();
-static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	HWND hwndList=GetDlgItem(hwndDlg, IDC_USERLIST);
-	hwndList_p = hwndList;
-	hwndCurKey_p = GetDlgItem(hwndDlg, IDC_CURRENT_KEY);
-	LVCOLUMN col = {0};
-	LVITEM item = {0};
-	TCHAR *tmp = NULL;
-	char *tmp2 = NULL;
-	extern bool bIsMiranda09, bJabberAPI;
-	NMLISTVIEW * hdr = (NMLISTVIEW *) lParam;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		col.pszText = TranslateW(_T("Contact"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 60;
-		ListView_InsertColumn(hwndList, 0, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Key ID"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 50;
-		ListView_InsertColumn(hwndList, 1, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Name"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 50;
-		ListView_InsertColumn(hwndList, 2, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Email"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 50;
-		ListView_InsertColumn(hwndList, 3, &col);
-		ZeroMemory(&col,sizeof(col));
-		col.pszText = TranslateW(_T("Protocol"));
-		col.mask = LVCF_TEXT | LVCF_WIDTH;
-		col.fmt = LVCFMT_LEFT;
-		col.cx = 60;
-		ListView_InsertColumn(hwndList, 4, &col);
-		ListView_SetExtendedListViewStyleEx(hwndList, 0, LVS_EX_CHECKBOXES | LVS_EX_FULLROWSELECT);
-		int i = 1, iRow = 0;
-		bool isContactHaveKey(HANDLE);
-		for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact != NULL; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
-		{
-			if(isContactHaveKey(hContact))
-			{
-				TCHAR *name = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR);
-				item.mask = LVIF_TEXT;
-				item.iItem = i;
-				item.iSubItem = 0;
-				item.pszText = name;
-				iRow = ListView_InsertItem(hwndList, &item);
-				ListView_SetItemText(hwndList, iRow, 0, name);
-				TCHAR *tmp = mir_a2t((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0));
-				ListView_SetItemText(hwndList, iRow, 4, tmp);
-				mir_free(tmp);
-				tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", "");
-				tmp = mir_a2t(tmp2);
-				mir_free(tmp2);
-				ListView_SetItemText(hwndList, iRow, 1, (_tcslen(tmp) > 1)?tmp:_T("not set"));
-				mir_free(tmp);
-				char *tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", "");
-				if(!toUTF16(tmp2).empty())
-					tmp = mir_wstrdup(toUTF16(tmp2).c_str());
-				else
-					tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", _T(""));
-				mir_free(tmp2);
-				ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set"));
-				mir_free(tmp);
-				tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", "");
-				if(!toUTF16(tmp2).empty())
-					tmp = mir_wstrdup(toUTF16(tmp2).c_str());
-				else
-					tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", _T(""));
-				mir_free(tmp2);
-				ListView_SetItemText(hwndList, iRow, 3, (_tcslen(tmp) > 1)?tmp:_T("not set"));
-				mir_free(tmp);
-				if(DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0))
-					ListView_SetCheckState(hwndList, iRow, 1);
-				user_data[i] = hContact;
-				ZeroMemory(&item,sizeof(item));
-				ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this
-				ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);
-				ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);
-				ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);
-				ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);
-				i++;
-			}			
-		}
-		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szLogFilePath", _T(""));
-		SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, (_tcslen(tmp) > 1)?tmp:_T("c:\\GPGdebug.log"));
-		mir_free(tmp);
-		CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0);
-		EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09);
-		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI));
-		{
-			string keyinfo = Translate("Default private key id");
-			keyinfo += ": ";
-			char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
-			keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set");
-			mir_free(keyid);
-			SetDlgItemTextA(hwndDlg, IDC_CURRENT_KEY, keyinfo.c_str());
-		}
-		if(bIsMiranda09)
-			CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1);
-		CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 0);
-		CheckStateLoadDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange", 0);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_DELETE_KEY_BUTTON:
-		  void setClistIcon(HANDLE hContact);
-		  void setSrmmIcon(HANDLE hContact);
-		  { //gpg execute block
-			  TCHAR tmp2[MAX_PATH] = {0};
-			  TCHAR *ptmp;
-			  char *tmp;
-			  bool keep = false;
-			  bool ismetacontact = false;
-			  HANDLE meta = NULL;
-			  HANDLE hContact = user_data[item_num+1];
-			  if(metaIsProtoMetaContacts(hContact))
-			  {
-				  meta = hContact;
-				  hContact = metaGetMostOnline(hContact);
-				  ismetacontact = true;
-			  }
-			  else if((meta = metaGetContact(user_data[item_num+1])) != NULL)
-			  {
-				  hContact = metaGetMostOnline(meta);
-				  ismetacontact = true;
-			  }
-			  tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", "");
-			  for(HANDLE hcnttmp = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hcnttmp != NULL; hcnttmp = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hcnttmp, 0))
-			  {
-				  if(hcnttmp != hContact)
-				  {
-					  char *tmp2 = UniGetContactSettingUtf(hcnttmp, szGPGModuleName, "KeyID", "");
-					  if(!strcmp(tmp, tmp2))
-					  {
-						  mir_free(tmp2);
-						  keep = true;
-						  break;
-					  }
-					  mir_free(tmp2);
-				  }
-			  }
-			  if(!keep)
-				  if(MessageBox(0, _T("This key not used by any contact, do you want to remove it from public keyring ?"), _T("Key info"), MB_YESNO) == IDYES)
-				  {
-					  wstring cmd;
-					  string output;
-					  DWORD exitcode;
-					  cmd += _T(" --batch --yes --delete-key ");
-					  ptmp = mir_a2t(tmp);
-					  cmd += ptmp;
-					  mir_free(ptmp);
-					  gpg_execution_params params;
-					  pxResult result;
-					  params.cmd = &cmd;
-					  params.useless = "";
-					  params.out = &output;
-					  params.code = &exitcode;
-					  params.result = &result;
-					  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					  {
-						  gpg_thread.~thread();
-						  TerminateProcess(params.hProcess, 1);
-						  params.hProcess = NULL;
-						  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						  mir_free(tmp);
-						  break;
-					  }
-					  if(result == pxNotFound)
-					  {
-						  mir_free(tmp);
-						  break;
-					  }
-					  if(output.find("--delete-secret-keys") != string::npos)
-						  MessageBoxA(0, "we have secret key for this public key, do not removing from GPG keyring", "info", MB_OK);
-					  else
-						  MessageBoxA(0, "Key removed from GPG keyring", "info", MB_OK);
-				  }
-				  mir_free(tmp);
-				  if(ismetacontact)
-				  {
-					  if(MessageBox(0, _T("Do you want to remove key from entire metacontact (all subcontacts) ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
-					  {
-						  HANDLE hcnt = NULL;
-						  int count = metaGetContactsNum(meta);
-						  for(int i = 0; i < count; i++)
-						  {
-							  hcnt = metaGetSubcontact(meta, i);
-							  if(hcnt)
-							  {
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "KeyID");
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "GPGPubKey");
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "KeyMainName");
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "KeyType");
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "KeyMainEmail");
-								  DBDeleteContactSetting(hcnt, szGPGModuleName, "KeyComment");
-								  setClistIcon(hcnt);
-								  setSrmmIcon(hcnt);
-							  }
-						  }
-					  }
-					  else
-					  {
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "KeyID");
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "GPGPubKey");
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "KeyMainName");
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "KeyType");
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "KeyMainEmail");
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "KeyComment");
-						  setClistIcon(hContact);
-						  setSrmmIcon(hContact);
-					  }
-				  }
-				  else
-				  {
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyID");
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "GPGPubKey");
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyMainName");
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyType");
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyMainEmail");
-					  DBDeleteContactSetting(user_data[item_num+1], szGPGModuleName, "KeyComment");
-					  setClistIcon(user_data[item_num+1]);
-					  setSrmmIcon(user_data[item_num+1]);
-				  }
-		  }
-		  ListView_SetItemText(hwndList, item_num, 3, _T("not set"));
-		  ListView_SetItemText(hwndList, item_num, 2, _T("not set"));
-		  ListView_SetItemText(hwndList, item_num, 1, _T("not set"));
-		  break;
-	  case IDC_SELECT_KEY:
-		  {
-			  void ShowFirstRunDialog();
-			  ShowFirstRunDialog();
-		  }
-		  break;
-	  case IDC_SAVE_KEY_BUTTON:
-		  {
-			  tmp = GetFilePath(_T("Export public key"), _T("*"), _T(".asc pubkey file"), true);
-			  if(!tmp)
-			  {
-				  break;
-			  }
-			  wstring str;
-			  {
-				  TCHAR *tmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "GPGPubKey", _T(""));
-				  str.append(tmp);
-				  mir_free(tmp);
-			  }
-			  wstring::size_type s = 0;
-			  while((s = str.find(_T("\r"), s)) != wstring::npos)
-			  {
-				  str.erase(s, 1);
-			  }
-			  wfstream f(tmp, std::ios::out);
-			  delete [] tmp;
-			  f<<str.c_str();
-			  f.close();
-		  }
-		  break;
-	  case IDC_COPY_KEY:
-		  {
-			  if(OpenClipboard(hwndDlg))
-			  {
-				  char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-				  std::string str = szKey;;
-				  mir_free(szKey);
-				  for(std::string::size_type i = str.find("\n"); i != std::string::npos; i = str.find("\n", i+2))
-					  str.replace(i, 1, "\r\n"); 
-				  HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, str.size() +1);
-				  if(!hMem)
-				  {
-					  MessageBoxA(0, "Failed to alocate memory", "Error", MB_OK);
-					  break;
-				  }
-				  szKey = (char*)GlobalLock(hMem);
-				  if(!szKey)
-				  {
-					  char msg[64];
-					  mir_snprintf(msg, 127, "Failed to lock memory with error %d", GetLastError());
-					  MessageBoxA(0, msg, "Error", MB_OK);
-					  GlobalFree(hMem);
-				  }
-				  memcpy(szKey, str.c_str(), str.size());
-				  szKey[str.size()] = '\0';
-				  str.clear();
-				  EmptyClipboard();
-				  GlobalUnlock(hMem);
-				  if(!SetClipboardData(CF_OEMTEXT, hMem))
-				  {
-					  GlobalFree(hMem);
-					  char msg[64];
-					  mir_snprintf(msg, 127, "Failed write to clipboard with error %d", GetLastError());
-					  MessageBoxA(0, msg, "Error", MB_OK);
-				  }
-				  CloseClipboard();
-			  }
-			  else
-			  {
-				  char msg[64];
-				  mir_snprintf(msg, 127, "Failed to open clipboard with error %d", GetLastError());
-				  MessageBoxA(0, msg, "Error", MB_OK);
-			  }
-		  }
-		  break;
-	  case IDC_LOG_FILE_SET:
-		  {
-			  tmp = GetFilePath(_T("Set log file"), _T("*"), _T("LOG files"), 1);
-			  SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp);
-			  mir_free(tmp);
-		  }
-		  break; 
-	  default:
-		  break;
-      }      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-   
-  case WM_NOTIFY:
-    {
-		EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && IsDlgButtonChecked(hwndDlg, IDC_JABBER_API)));
-		if(hdr && IsWindowVisible(hdr->hdr.hwndFrom) && hdr->iItem != (-1))
-		{
-			if(hdr->hdr.code == NM_CLICK)
-			{
-				item_num = hdr->iItem;
-			}
-			else if(hdr->hdr.code == LVN_ITEMCHANGED)
-			{
-				void setClistIcon(HANDLE hContact);
-				void setSrmmIcon(HANDLE hContact);
-				if(ListView_GetCheckState(hwndList, item_num))
-					DBWriteContactSettingByte(user_data[item_num+1], szGPGModuleName, "GPGEncryption", 1);
-				else
-					DBWriteContactSettingByte(user_data[item_num+1], szGPGModuleName, "GPGEncryption", 0);
-				setClistIcon(user_data[item_num+1]);
-				setSrmmIcon(user_data[item_num+1]);
-			}
-		}
-		switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-			extern bool bDebugLog, bJabberAPI, bFileTransfers;
-			bDebugLog = CheckStateStoreDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog");
-			if(bDebugLog)
-				debuglog.init();
-			bJabberAPI = CheckStateStoreDB(hwndDlg, IDC_JABBER_API, "bJabberAPI");
-			bFileTransfers = CheckStateStoreDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers");
-			bAutoExchange = CheckStateStoreDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange");
-			{
-				TCHAR tmp[512];
-				GetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp, 512);
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szLogFilePath", tmp);
-			}
-          return TRUE;
-        }
-      }
-    }
-    break;
-  }
-
-  return FALSE;
-}
-
-
-static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	TCHAR *tmp = NULL;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg.exe"));
-		SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-		mir_free(tmp);
-		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("gpg"));
-		SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp);
-		mir_free(tmp);
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_SET_BIN_PATH:
-		  {
-			  GetFilePath(_T("Choose gpg.exe"), "szGpgBinPath", _T("*.exe"), _T("EXE Executables"));
-			  tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg.exe"));
-			  SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-			  bool gpg_exists = false;
-			  {
-				  if(_waccess(tmp, 0) != -1)
-					  gpg_exists = true;
-				  if(gpg_exists)
-				  {
-					  bool bad_version = false;
-					  TCHAR *tmp_path = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T(""));
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-					  string out;
-					  DWORD code;
-					  wstring cmd = _T("--version");
-					  gpg_execution_params params;
-					  pxResult result;
-					  params.cmd = &cmd;
-					  params.useless = "";
-					  params.out = &out;
-					  params.code = &code;
-					  params.result = &result;
-					  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					  {
-						  gpg_thread.~thread();
-						  TerminateProcess(params.hProcess, 1);
-						  params.hProcess = NULL;
-					  }
-					  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp_path);
-					  mir_free(tmp_path);
-					  string::size_type p1 = out.find("(GnuPG) ");
-					  if(p1 != string::npos)
-					  {
-						  p1 += strlen("(GnuPG) ");
-						  if(out[p1] != '1')
-							  bad_version = true;
-					  }
-					  else
-					  {
-						  bad_version = false;
-						  MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK);
-					  }
-/*					  if(bad_version) //looks like working fine with gpg2
-						  MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); */
-				  }
-			  }
-			  char mir_path[MAX_PATH];
-			  char *atmp = mir_t2a(tmp);
-			  mir_free(tmp);
-			  CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			  char* p_path = NULL;
-			  if(StriStr(atmp, mir_path))
-			  {
-				  p_path = atmp + strlen(mir_path);
-				  tmp = mir_a2t(p_path);
-				  SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp);
-			  }
-		  }
-		  break;
-	  case IDC_SET_HOME_DIR:
-		  {
-			  GetFolderPath(_T("Set home diractory"), "szHomePath");
-			  tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-			  SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp);
-			  char mir_path[MAX_PATH];
-			  char *atmp = mir_t2a(tmp);
-			  mir_free(tmp);
-			  CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-			  char* p_path = NULL;
-			  if(StriStr(atmp, mir_path))
-			  {
-				  p_path = atmp + strlen(mir_path);
-				  tmp = mir_a2t(p_path);
-				  SetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp);
-			  }
-		  }
-		  break;
-	  default:
-		break;
-      }
-      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-		  TCHAR tmp[512];
-		  GetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp, 512);
-		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-		  GetDlgItemText(hwndDlg, IDC_HOME_DIR, tmp, 512);
-		  while(tmp[_tcslen(tmp)-1] == '\\')
-			  tmp[_tcslen(tmp)-1] = '\0';
-		  DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", tmp);
-          return TRUE;
-        }
-      }
-	}
-    break;
-  }
-  return FALSE;
-}
-
-static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		TranslateDialogDefault(hwndDlg);
-		CheckStateLoadDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags", 0);
-		CheckStateLoadDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags", 0);
-		{
-			TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("<GPGdec>"));
-			SetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp);
-			mir_free(tmp);
-			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInCloseTag", _T("</GPGdec>"));
-			SetDlgItemText(hwndDlg, IDC_IN_CLOSE_TAG, tmp);
-			mir_free(tmp);
-			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutOpenTag", _T("<GPGenc>"));
-			SetDlgItemText(hwndDlg, IDC_OUT_OPEN_TAG, tmp);
-			mir_free(tmp);
-			tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szOutCloseTag", _T("</GPGenc>"));
-			SetDlgItemText(hwndDlg, IDC_OUT_CLOSE_TAG, tmp);
-			mir_free(tmp);
-		}
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case IDC_APPEND_TAGS:
-		  break;
-	  default:
-		break;
-      }
-      
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-			bAppendTags = CheckStateStoreDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags");
-			bStripTags = CheckStateStoreDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags");
-			{
-				TCHAR tmp[128];
-				GetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp, 128);
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szInOpenTag", tmp);
-				mir_free(inopentag);
-				inopentag = new TCHAR [_tcslen(tmp)+1];
-				_tcscpy(inopentag, tmp);
-				GetDlgItemText(hwndDlg, IDC_IN_CLOSE_TAG, tmp, 128);
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szInCloseTag", tmp);
-				mir_free(inclosetag);
-				inclosetag = new TCHAR [_tcslen(tmp)+1];
-				_tcscpy(inclosetag, tmp);
-				GetDlgItemText(hwndDlg, IDC_OUT_OPEN_TAG, tmp, 128);
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szOutOpenTag", tmp);
-				mir_free(outopentag);
-				outopentag = new TCHAR [_tcslen(tmp)+1];
-				_tcscpy(outopentag, tmp);
-				GetDlgItemText(hwndDlg, IDC_OUT_CLOSE_TAG, tmp, 128);
-				DBWriteContactSettingTString(NULL, szGPGModuleName, "szOutCloseTag", tmp);
-				mir_free(outclosetag);
-				outclosetag = new TCHAR [_tcslen(tmp)+1];
-				_tcscpy(outclosetag, tmp);
-			}
-          return TRUE;
-        }
-      }
-	}
-    break;
-  }
-  return FALSE;
-}
-
-static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		extern bool bJabberAPI;
-		TranslateDialogDefault(hwndDlg);
-		CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning", 0);
-		EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI);
-
-      return TRUE;
-    }
-    
- 
-  case WM_COMMAND:
-    {
-      SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-			bPresenceSigning = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning");
-          return TRUE;
-        }
-      }
-	}
-    break;
-  }
-  return FALSE;
-}
-
-HWND hPubKeyEdit = NULL;
-
-LONG_PTR default_edit_proc = NULL;
-
-static BOOL CALLBACK editctrl_ctrl_a(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-	LRESULT ret = 0;
-	switch(msg)
-	{
-	case WM_KEYDOWN:
-		if(wParam == 0x41 && GetKeyState(VK_CONTROL)< 0 )
-			SendMessage(hwndDlg, EM_SETSEL, 0, -1);
-		break;
-	default:
-		ret = CallWindowProc((WNDPROC)default_edit_proc, hwndDlg, msg, wParam, lParam);
-		break;
-	}
-	return ret;
-}
-
-static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam)
-{
-	static HANDLE hContact = user_data[item_num+1];
-
-
-	TCHAR *tmp = NULL;
-
-	wstring key_buf;
-	wstring::size_type ws1 = 0, ws2 = 0;
-  switch (msg)
-  {
-  case WM_INITDIALOG:
-    {
-		default_edit_proc = GetWindowLong(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC);
-		SetWindowPos(hwndDlg, 0, load_key_rect.left, load_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW);
-		SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC, (LONG_PTR)editctrl_ctrl_a);
-		HANDLE hcnt = hContact;
-		if(metaIsProtoMetaContacts(hcnt))
-			hcnt = metaGetMostOnline(hcnt);
-		TranslateDialogDefault(hwndDlg);
-		{
-			string msg = Translate("Load Public GPG Key for ");
-			msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);
-			SetWindowTextA(hwndDlg, msg.c_str());
-		}
-		bool isContactSecured(HANDLE);
-		if(!hcnt)
-		{
-			EnableWindow(GetDlgItem(hwndDlg, IDC_SELECT_EXISTING), 0);
-			EnableWindow(GetDlgItem(hwndDlg, IDC_ENABLE_ENCRYPTION), 0);
-		}
-		if(isContactSecured(hcnt))
-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn off encryption")));
-		else
-		{
-			SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn on encryption")));
-			CheckDlgButton(hwndDlg, IDC_ENABLE_ENCRYPTION, 1);
-		}
-		if(hcnt)
-		{
-			tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T(""));
-			wstring str = tmp;
-			mir_free(tmp); tmp = NULL;
-			wstring::size_type p = 0, stop = 0;
-			if(!str.empty())
-			{
-				for(;;)
-				{
-					if((p = str.find(_T("\n"), p+2)) != wstring::npos)
-					{
-						if(p > stop)
-						{
-							stop = p;
-							str.insert(p, _T("\r"));
-						}			
-						else 
-							break;
-					}
-				}
-			}
-//			char *tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID_Prescense", "");
-			if(!hcontact_data[hcnt].key_in_prescense.empty())
-			{
-				char *tmp2 = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID", "");
-				if(!tmp2[0])
-				{
-					string out;
-					DWORD code;
-					wstring cmd = _T(" --export -a ");
-//					TCHAR *tmp3 = mir_a2t(tmp);
-					cmd += toUTF16(hcontact_data[hcnt].key_in_prescense);
-//					mir_free(tmp3);
-					gpg_execution_params params;
-					pxResult result;
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-					{
-						gpg_thread.~thread();
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					}
-					if((out.find("-----BEGIN PGP PUBLIC KEY BLOCK-----") != string::npos) && (out.find("-----END PGP PUBLIC KEY BLOCK-----") != string::npos))
-					{
-						string::size_type p = 0, stop = 0;
-						for(;;)
-						{
-							if((p = out.find("\n", p+2)) != string::npos)
-							{
-								if(p > stop)
-								{
-									stop = p;
-									out.insert(p, "\r");
-								}			
-								else 
-									break;
-							}
-						}
-						TCHAR *tmp3 = mir_a2t(out.c_str());
-						str.clear();
-						str.append(tmp3);
-						string msg = "Load Public GPG Key for ";
-						msg += (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hcnt, 0);
-						msg += " (Key ID: ";
-						msg += hcontact_data[hcnt].key_in_prescense;
-						msg += " found in prescense, and exists in keyring.)";
-						SetWindowTextA(hwndDlg, msg.c_str());
-					}
-					else
-					{
-						string msg = "Load Public GPG Key (Key ID: ";
-						msg += hcontact_data[hcnt].key_in_prescense;
-						msg += " found in prescense.)";
-						SetWindowTextA(hwndDlg, msg.c_str());
-						EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT), 1);
-					}
-				}
-				mir_free(tmp2);
-			}
-			if(tmp)
-				mir_free(tmp);
-			SetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, !str.empty()?str.c_str():_T(""));
-		}
-		hPubKeyEdit = GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT);
-		return TRUE;
-    }
-    
-  case WM_COMMAND:
-    {
-      switch (LOWORD(wParam))
-      {
-	  case ID_OK:
-		  {
-			  tmp = new TCHAR [40960];
-			  TCHAR *begin, *end;
-			  GetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, tmp, 40960);
-			  key_buf.append(tmp);
-			  key_buf.append(_T("\n")); //no new line at end of file )
-			  delete [] tmp;
-			  while((ws1 = key_buf.find(_T("\r"), ws1)) != wstring::npos)
-			  {
-				  key_buf.erase(ws1, 1); //remove windows specific trash
-			  }
-			  ws1 = 0;
-			  if(((ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"))) != wstring::npos) && ((ws1 = key_buf.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"))) != wstring::npos))
-			  {
-				  begin = (TCHAR*)mir_alloc(sizeof(TCHAR) * (_tcslen(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----")) + 1));
-				  _tcscpy(begin, _T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-				  end = (TCHAR*)mir_alloc(sizeof( TCHAR) * (_tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----")) + 1));
-				  _tcscpy(end, _T("-----END PGP PUBLIC KEY BLOCK-----"));
-			  }
-			  else if(((ws2 = key_buf.find(_T("-----END PGP PRIVATE KEY BLOCK-----"))) != wstring::npos) && ((ws1 = key_buf.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"))) != wstring::npos))
-			  {
-				  begin = (TCHAR*)mir_alloc(sizeof(TCHAR) * (_tcslen(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----")) + 1));
-				  _tcscpy(begin, _T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
-				  end = (TCHAR*)mir_alloc(sizeof(TCHAR) * (_tcslen(_T("-----END PGP PRIVATE KEY BLOCK-----")) + 1));
-				  _tcscpy(end, _T("-----END PGP PRIVATE KEY BLOCK-----"));
-			  }
-			  else
-			  {
-				  MessageBox(0, _T("This is not public or private key"), _T("INFO"), MB_OK);
-				  break;
-			  }
-			  ws2 += _tcslen(end);
-			  bool allsubcontacts = false;
-			  {
-				  if(metaIsProtoMetaContacts(hContact))
-				  {
-					  HANDLE hcnt = NULL;
-					  if(MessageBox(0, _T("Do you want load key for all subcontacts ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
-					  {
-						  allsubcontacts = true;
-						  int count = metaGetContactsNum(hContact);
-						  for(int i = 0; i < count; i++)
-						  {
-							  hcnt = metaGetSubcontact(hContact, i);
-							  if(hcnt)
-								  DBWriteContactSettingTString(hcnt, szGPGModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str());
-						  }
-					  }
-					  else
-						  DBWriteContactSettingTString(metaGetMostOnline(hContact), szGPGModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str());
-				  }
-				  else
-					  DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", key_buf.substr(ws1,ws2-ws1).c_str());
-			  }
-			  tmp = (TCHAR*)mir_alloc(sizeof( TCHAR) * (key_buf.length()+1));
-			  _tcscpy(tmp, key_buf.substr(ws1,ws2-ws1).c_str());
-			  { //gpg execute block
-				  wstring cmd;
-				  TCHAR tmp2[MAX_PATH] = {0};
-				  TCHAR *ptmp;
-				  string output;
-				  DWORD exitcode;
-				  {
-					  HANDLE hcnt = hContact;
-					  if(metaIsProtoMetaContacts(hcnt))
-						  hcnt = metaGetMostOnline(hcnt);
-					  ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-					  _tcscpy(tmp2, ptmp);
-					  mir_free(ptmp);
-					  _tcscat(tmp2, _T("\\"));
-					  _tcscat(tmp2, _T("temporary_exported.asc"));
-					  DeleteFile(tmp2);
-					  wfstream f(tmp2, std::ios::out);
-					  ptmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T(""));
-					  wstring str = ptmp;
-					  mir_free(ptmp);
-					  wstring::size_type s = 0;
-					  while((s = str.find(_T("\r"), s)) != wstring::npos)
-					  {
-						  str.erase(s, 1);
-					  }
-					  f<<str.c_str();
-					  f.close();
-					  cmd += _T(" --batch ");
-					  cmd += _T(" --import \"");
-					  cmd += tmp2;
-					  cmd += _T("\"");
-				  }
-				  gpg_execution_params params;
-				  pxResult result;
-				  params.cmd = &cmd;
-				  params.useless = "";
-				  params.out = &output;
-				  params.code = &exitcode;
-				  params.result = &result;
-				  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-				  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-				  {
-					  gpg_thread.~thread();
-					  TerminateProcess(params.hProcess, 1);
-					  params.hProcess = NULL;
-					  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-					  break;
-				  }
-				  if(result == pxNotFound)
-					  break;
-				  mir_free(begin);
-				  mir_free(end);
-				  if(hContact)
-				  {
-					  if(metaIsProtoMetaContacts(hContact))
-					  {
-						  HANDLE hcnt = NULL;
-						  if(allsubcontacts)
-						  {
-							  int count = metaGetContactsNum(hContact);
-							  for(int i = 0; i < count; i++)
-							  {
-								  hcnt = metaGetSubcontact(hContact, i);
-								  if(hcnt)
-									  DBDeleteContactSetting(hcnt, szGPGModuleName, "bAlwatsTrust");
-							  }
-						  }
-						  else
-							  DBDeleteContactSetting(metaGetMostOnline(hContact), szGPGModuleName, "bAlwatsTrust");
-					  }
-					  else
-						  DBDeleteContactSetting(hContact, szGPGModuleName, "bAlwatsTrust");
-				  }
-				  {
-					  TCHAR *tmp;
-					  if(output.find("already in secret keyring") != string::npos)
-					  {
-						  MessageBox(0, _T("Key already in scret key ring."), _T("Info"), MB_OK);
-						  DeleteFile(tmp2);
-						  break;
-					  }
-					  char *tmp2;
-					  string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-					  string::size_type s2 = output.find(":", s);
-					  tmp2 = (char*)mir_alloc(output.substr(s,s2-s).length()+1);
-					  strcpy(tmp2, output.substr(s,s2-s).c_str());
-					  mir_utf8decode(tmp2, 0);
-					  {
-						  if(metaIsProtoMetaContacts(hContact))
-						  {
-							  HANDLE hcnt = NULL;
-							  if(allsubcontacts)
-							  {
-								  int count = metaGetContactsNum(hContact);
-								  for(int i = 0; i < count; i++)
-								  {
-									  hcnt = metaGetSubcontact(hContact, i);
-									  if(hcnt)
-										  DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyID", tmp2);
-								  }
-							  }
-							  else
-								  DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyID", tmp2);
-						  }
-						  else
-							  DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", tmp2);
-					  }
-					  mir_free(tmp2);
-					  tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s)).c_str());
-					  if(hContact && hwndList_p)
-						  ListView_SetItemText(hwndList_p, item_num, 1, tmp);
-					  mir_free(tmp);
-					  s = output.find("“", s2);
-					  if(s == string::npos)
-					  {
-						  s = output.find("\"", s2);
-						  s += 1;
-					  }
-					  else
-						  s += 3;
-					  if((s2 = output.find("(", s)) == string::npos)
-						  s2 = output.find("<", s);
-					  else if(s2 > output.find("<", s))
-						  s2 = output.find("<", s);
-					  if(s2 != string::npos)
-					  {
-					  tmp2 = (char*)mir_alloc(output.substr(s,s2-s-1).length()+1);
-					  strcpy(tmp2, output.substr(s,s2-s-1).c_str());
-					  mir_utf8decode(tmp2, 0);
-					  if(hContact)
-					  {
-						  if(metaIsProtoMetaContacts(hContact))
-						  {
-							  HANDLE hcnt = NULL;
-							  if(allsubcontacts)
-							  {
-								  int count = metaGetContactsNum(hContact);
-								  for(int i = 0; i < count; i++)
-								  {
-									  hcnt = metaGetSubcontact(hContact, i);
-									  if(hcnt)
-										  DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
-								  }
-							  }
-							  else
-								  DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
-						  }
-						  else
-							  DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
-					  }
-					  mir_free(tmp2);
-					  tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s-1)).c_str());
-					  if(hContact && hwndList_p)
-						  ListView_SetItemText(hwndList_p, item_num, 2, tmp);
-					  mir_free(tmp);
-					  if((s = output.find(")", s2)) == string::npos)
-						  s = output.find(">", s2);
-					  else if(s > output.find(">", s2))
-						  s = output.find(">", s2);
-					  s2++;
-					  if(output[s] == ')')
-					  {
-						  tmp2 = new char [output.substr(s2,s-s2).length()+1];
-						  strcpy(tmp2, output.substr(s2,s-s2).c_str());
-						  mir_utf8decode(tmp2, 0);
-						  if(hContact)
-						  {
-							  if(metaIsProtoMetaContacts(hContact))
-							  {
-								  HANDLE hcnt = NULL;
-								  if(allsubcontacts)
-								  {
-									  int count = metaGetContactsNum(hContact);
-									  for(int i = 0; i < count; i++)
-									  {
-										  hcnt = metaGetSubcontact(hContact, i);
-										  if(hcnt)
-											  DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());
-									  }
-								  }
-								  else
-									  DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());
-							  }
-							  else
-								  DBWriteContactSettingString(hContact, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());
-						  }
-						  mir_free(tmp2);
-						  s+=3;
-						  s2 = output.find(">", s);
-						  tmp2 = new char [output.substr(s,s2-s).length()+1];
-						  strcpy(tmp2, output.substr(s,s2-s).c_str());
-						  mir_utf8decode(tmp2, 0);
-						  if(hContact)
-						  {
-							  if(metaIsProtoMetaContacts(hContact))
-							  {
-								  HANDLE hcnt = NULL;
-								  if(allsubcontacts)
-								  {
-									  int count = metaGetContactsNum(hContact);
-									  for(int i = 0; i < count; i++)
-									  {
-										  hcnt = metaGetSubcontact(hContact, i);
-										  if(hcnt)
-											  DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());
-									  }
-								  }
-								  else
-									  DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());
-							  }
-							  else
-								  DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());
-						  }
-						  mir_free(tmp2);
-						  tmp = mir_wstrdup(toUTF16(output.substr(s,s2-s)).c_str());
-						  if(hContact && hwndList_p)
-							  ListView_SetItemText(hwndList_p, item_num, 3, tmp);
-						  mir_free(tmp);
-					  }
-					  else
-					  {
-						  tmp2 = (char*)mir_alloc(output.substr(s2,s-s2).length()+1);
-						  strcpy(tmp2, output.substr(s2,s-s2).c_str());
-						  mir_utf8decode(tmp2, 0);
-						  if(hContact)
-						  {
-							  if(metaIsProtoMetaContacts(hContact))
-							  {
-								  HANDLE hcnt = NULL;
-								  if(allsubcontacts)
-								  {
-									  int count = metaGetContactsNum(hContact);
-									  for(int i = 0; i < count; i++)
-									  {
-										  hcnt = metaGetSubcontact(hContact, i);
-										  if(hcnt)
-											  DBWriteContactSettingString(hcnt, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-									  }
-								  }
-								  else
-									  DBWriteContactSettingString(metaGetMostOnline(hContact), szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-							  }
-							  else
-								  DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-						  }
-						  mir_free(tmp2);
-						  tmp = mir_wstrdup(toUTF16(output.substr(s2,s-s2)).c_str());
-						  if(hContact && hwndList_p)
-							  ListView_SetItemText(hwndList_p, item_num, 3, tmp);
-						  mir_free(tmp);
-					  }
-					  }
-					  if(hContact && hwndList_p)
-					  {					  
-						  ListView_SetColumnWidth(hwndList_p, 0, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList_p, 1, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList_p, 2, LVSCW_AUTOSIZE);
-						  ListView_SetColumnWidth(hwndList_p, 3, LVSCW_AUTOSIZE);
-					  }
-				  }
-				  if(!hContact)
-				  {				  
-					  TCHAR *fp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyID", _T(""));
-					  {
-						  string out;
-						  DWORD code;
-						  wstring cmd = _T("--batch -a --export ");
-						  cmd += fp;
-						  mir_free(fp);
-						  gpg_execution_params params;
-						  pxResult result;
-						  params.cmd = &cmd;
-						  params.useless = "";
-						  params.out = &out;
-						  params.code = &code;
-						  params.result = &result;
-						  boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-						  if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-						  {
-							  gpg_thread.~thread();
-							  TerminateProcess(params.hProcess, 1);
-							  params.hProcess = NULL;
-							  debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-							  break;
-						  }
-						  if(result == pxNotFound)
-							  break;
-						  string::size_type s = 0;
-						  while((s = out.find("\r", s)) != string::npos)
-						  {
-							  out.erase(s, 1);
-						  }
-						  DBWriteContactSettingString(hContact, szGPGModuleName, "GPGPubKey", out.c_str());
-					  }
-				  }
-				  tmp = mir_wstrdup(toUTF16(output).c_str());
-				  MessageBox(0, tmp, _T(""), MB_OK);
-				  mir_free(tmp);
-				  DeleteFile(tmp2);
-			  }
-			  key_buf.clear();
-			  if(IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ENCRYPTION))
-			  {
-				  void setSrmmIcon(HANDLE);
-				  void setClistIcon(HANDLE);
-				  if(hContact)
-				  {
-					  if(metaIsProtoMetaContacts(hContact))
-					  {
-						  HANDLE hcnt = NULL;
-						  if(allsubcontacts)
-						  {
-							  int count = metaGetContactsNum(hContact);
-							  for(int i = 0; i < count; i++)
-							  {
-								  hcnt = metaGetSubcontact(hContact, i);
-								  if(hcnt)
-								  {
-									  if(!isContactSecured(hcnt))
-										  DBWriteContactSettingByte(hcnt, szGPGModuleName, "GPGEncryption", 1);
-									  else
-										  DBWriteContactSettingByte(hcnt, szGPGModuleName, "GPGEncryption", 0);
-									  setSrmmIcon(hContact);
-									  setClistIcon(hContact);
-								  }
-							  }
-						  }
-						  else if(!isContactSecured(hContact))
-							  DBWriteContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", 1);
-						  else
-							  DBWriteContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", 0);
-					  }
-					  else if(!isContactSecured(hContact))
-						  DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-					  else
-						  DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-				  }
-			  }
-			  DestroyWindow(hwndDlg);
-			  }
-			  break;
-	  case ID_LOAD_FROM_FILE:
-		  {
-			  tmp = GetFilePath(_T("Set file containing GPG public key"), _T("*"), _T("GPG public key file"));
-			  if(!tmp)
-			  {
-				  break;
-			  }
-			  wfstream f(tmp, std::ios::in | std::ios::ate | std::ios::binary);
-			  delete [] tmp;
-			  if(!f.is_open())
-			  {
-				  MessageBox(0, _T("Failed to open file"), _T("Error"), MB_OK);
-				  break;
-			  }
-			  if(f.is_open())
-			  {
-				  std::wifstream::pos_type size = f.tellg();
-				  TCHAR *tmp = new TCHAR [(std::ifstream::pos_type)size+(std::ifstream::pos_type)1];
-				  f.seekg(0, std::ios::beg);
-				  f.read(tmp, size);
-				  tmp[size]= '\0';
-				  key_buf.append(tmp);
-				  delete [] tmp;
-				  f.close();
-			  }
-			  if(key_buf.empty())
-			  {
-				  key_buf.clear();
-				  debuglog<<time_str()<<": info: Failed to read key file\n";
-				  break;
-			  }
-			  ws2 = key_buf.find(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			  ws1 = key_buf.find(_T("-----BEGIN PGP PUBLIC KEY BLOCK-----"));
-			  if(ws2 == wstring::npos || ws1 == wstring::npos)
-			  {
-				  ws2 = key_buf.find(_T("-----END PGP PRIVATE KEY BLOCK-----"));
-				  ws1 = key_buf.find(_T("-----BEGIN PGP PRIVATE KEY BLOCK-----"));
-			  }
-			  if(ws2 == wstring::npos || ws1 == wstring::npos)
-			  {
-				  MessageBox(0, _T("Where is no public or private key."), _T("Info"), MB_OK);
-				  break;
-			  }
-			  ws2 += _tcslen(_T("-----END PGP PUBLIC KEY BLOCK-----"));
-			  SetDlgItemText(hwndDlg, IDC_PUBLIC_KEY_EDIT, key_buf.substr(ws1,ws2-ws1).c_str());
-			  key_buf.clear();
-		  }
-		  break;
-	  case IDC_IMPORT:
-		  extern HANDLE new_key_hcnt;
-		  extern boost::mutex new_key_hcnt_mutex;
-		  new_key_hcnt_mutex.lock();
-		  new_key_hcnt = hContact;
-		  void ShowImportKeyDialog();
-		  ShowImportKeyDialog();
-		  break;
-	  case IDC_SELECT_EXISTING:
-		  void ShowSelectExistingKeyDialog();
-		  ShowSelectExistingKeyDialog();
-		  break;
-      }
-      break;
-    }
-    
-  case WM_NOTIFY:
-    {
-      switch (((LPNMHDR)lParam)->code)
-      {
-        
-      case PSN_APPLY:
-        {
-          return TRUE;
-        }
-      }
-	}
-	break;
-	case WM_CLOSE:
-		DestroyWindow(hwndDlg);
-		break;
-	case WM_DESTROY:
-		{
-			GetWindowRect(hwndDlg, &load_key_rect);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowX", load_key_rect.left);
-			DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top);
-		}
-		break;
-  }
-
-  return FALSE;
-}
-
-
-
-void ShowLoadPublicKeyDialog()
-{
-	DialogBox(hInst, MAKEINTRESOURCE(IDD_LOAD_PUBLIC_KEY), NULL, (DLGPROC)DlgProcLoadPublicKey);
-}
diff --git a/plugins/new_gpg/src/resource.h b/plugins/new_gpg/src/resource.h
deleted file mode 100755
index 027e27965c..0000000000
--- a/plugins/new_gpg/src/resource.h
+++ /dev/null
@@ -1,96 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by new_gpg.rc
-//
-#define IDD_LOAD_PUBLIC_KEY             102
-#define IDD_FIRST_RUN                   103
-#define IDD_OPT_GPG                     104
-#define IDD_OPT_GPG_BIN                 105
-#define IDD_BIN_PATH                    106
-#define IDD_OPT_GPG_MESSAGES            107
-#define IDD_NEW_KEY                     108
-#define IDD_KEY_GEN                     109
-#define IDD_LOAD_EXISTING_KEY           110
-#define IDD_KEY_PASSWD                  111
-#define IDI_SECURED                     112
-#define IDD_IMPORT_KEY                  112
-#define IDI_UNSECURED                   113
-#define IDD_OPT_GPG_ADVANCED            113
-#define IDC_SET_BIN_PATH                1016
-#define IDC_SET_HOME_DIR                1017
-#define IDC_BIN_PATH                    1018
-#define IDC_HOME_DIR                    1019
-#define IDC_USERLIST                    1020
-#define IDC_LOAD_KEY_BUTTON             1022
-#define ID_OK                           1023
-#define ID_LOD_FROM_FILE                1024
-#define ID_LOAD_FROM_FILE               1024
-#define IDC_EDIT1                       1025
-#define IDC_PUBLIC_KEY_EDIT             1025
-#define IDC_KEY_PASSWORD                1025
-#define IDC_IN_OPEN_TAG                 1025
-#define IDC_KEY_PASSWD                  1025
-#define IDC_PASSWORD                    1025
-#define IDC_LOG_FILE_EDIT               1025
-#define IDC_BUTTON1                     1026
-#define IDC_SAVE_KEY_BUTTON             1026
-#define IDC_GENERATE_KEY                1026
-#define IDC_IGNORE_KEY                  1026
-#define IDC_SELECT_EXISTING             1026
-#define IDC_KEY_EMAIL                   1026
-#define IDC_DELETE_KEY_BUTTON           1027
-#define IDC_IN_CLOSE_TAG                1027
-#define IDC_KEY_REAL_NAME               1027
-#define IDC_KEY_LIST                    1028
-#define IDC_KEY_COMMENT                 1028
-#define IDC_OUT_OPEN_TAG                1029
-#define IDC_APPEND_TAGS                 1030
-#define IDC_OUT_CLOSE_TAG               1031
-#define IDC_SELECT_KEY                  1033
-#define IDC_MESSAGE                     1034
-#define ID_IMPORT                       1035
-#define IDC_IMPORT_AND_USE              1036
-#define IDC_KEY_TYPE                    1039
-#define IDC_KEY_LENGTH                  1040
-#define IDC_KEY_EXPIRE_DATE             1043
-#define IDC_EXISTING_KEY_LIST           1045
-#define IDC_BUTTON2                     1046
-#define IDC_OTHER                       1046
-#define IDC_LOG_FILE_SET                1046
-#define IDC_IMPORT                      1046
-#define IDC_SAVE_PASSWORD               1047
-#define IDC_DEBUG_LOG                   1048
-#define IDC_JABBER_API                  1049
-#define IDC_ENABLE_ENCRYPTION           1050
-#define IDC_KEY_FROM                    1051
-#define IDC_DELETE_KEY                  1052
-#define IDC_KEYID                       1053
-#define IDC_CURRENT_KEY                 1054
-#define IDC_DEFAULT_PASSWORD            1055
-#define IDC_KEYSERVER                   1058
-#define IDC_FILE_TRANSFERS              1061
-#define IDC_REMOVE_FILTERS              1062
-#define IDC_GENERATE_RANDOM             1063
-#define IDC_AUTO_EXCHANGE               1064
-#define IDC_AUT_EXCHANGE                1065
-#define IDC_BUTTON3                     1066
-#define IDC_COPY_KEY                    1066
-#define IDC_STRIP_TAGS                  1067
-#define IDC_CHECK1                      1068
-#define IDC_PRESCENSE_SUBSCRIPTION      1068
-#define IDC_GENERATING_KEY              1069
-#define IDC_GENERATING_TEXT             1070
-#define IDC_KEY_ID                      1071
-#define IDC_COMBO1                      1072
-#define IDC_ACCOUNT                     1072
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        114
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1073
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/plugins/new_gpg/src/srmm.cpp b/plugins/new_gpg/src/srmm.cpp
deleted file mode 100755
index 6fc204a9a9..0000000000
--- a/plugins/new_gpg/src/srmm.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright � 2010-2012 SecureIM developers (baloo and others), sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-
-#include "commonheaders.h"
-
-void ShowStatusIcon(HANDLE hContact);
-void setSrmmIcon(HANDLE hContact);
-
-int __cdecl onWindowEvent(WPARAM wParam, LPARAM lParam) {
-
-	MessageWindowEventData *mwd = (MessageWindowEventData *)lParam;
-	if(mwd->uType == MSG_WINDOW_EVT_OPEN || mwd->uType == MSG_WINDOW_EVT_OPENING) 
-	{
-		setSrmmIcon(mwd->hContact);
-	}
-	return 0;
-}
-
-
-int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) {
-	HANDLE hContact = (HANDLE)wParam;
-	HANDLE hMeta = NULL;
-	if(metaIsProtoMetaContacts(hContact))
-	{
-		hMeta = hContact;
-		hContact = metaGetMostOnline(hContact); // ������� ���, ����� ������� ������ ���������
-	}
-	else if(metaIsSubcontact(hContact))
-		hMeta = metaGetContact(hContact);
-	StatusIconClickData *sicd = (StatusIconClickData *)lParam;
-	if(strcmp(sicd->szModule, szGPGModuleName)) 
-		return 0; // not our event
-	
-	void setSrmmIcon(HANDLE);
-	void setClistIcon(HANDLE);
-	bool isContactHaveKey(HANDLE hContact);
-	BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-	if(enc)
-	{
-		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-		hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 0):0;
-		setSrmmIcon(hContact);
-		setClistIcon(hContact);
-	}
-	else if(!enc)
-	{
-		if(!isContactHaveKey(hContact))
-		{
-			void ShowLoadPublicKeyDialog();
-			extern map<int, HANDLE> user_data;
-			extern int item_num;
-			item_num = 0;		 //black magic here
-			user_data[1] = hContact;
-			ShowLoadPublicKeyDialog();
-		}
-		else
-		{
-			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-			hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0;
-			setSrmmIcon(hContact);
-			setClistIcon(hContact);
-			return 0;
-		}
-		if(isContactHaveKey(hContact))
-		{
-			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-			hMeta?DBWriteContactSettingByte(hMeta, szGPGModuleName, "GPGEncryption", 1):0;
-			setSrmmIcon(hContact);
-			setClistIcon(hContact);
-		}
-	}
-	return 0;
-}
diff --git a/plugins/new_gpg/src/utilities.cpp b/plugins/new_gpg/src/utilities.cpp
deleted file mode 100755
index 242ccc4b67..0000000000
--- a/plugins/new_gpg/src/utilities.cpp
+++ /dev/null
@@ -1,1824 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-
-#include "commonheaders.h"
-
-
-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef)
-{
-  DBVARIANT dbv = {DBVT_DELETED};
-  TCHAR* szRes;
-  if (DBGetContactSettingTString(hContact, szModule, szSetting, &dbv))
-	  return mir_tstrdup(szDef);
-  if(dbv.pszVal)
-	  szRes = mir_tstrdup(dbv.ptszVal);
-  DBFreeVariant(&dbv);
-  return szRes;
-}
-
-char* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, char* szDef)
-{
-  DBVARIANT dbv = {DBVT_DELETED};
-  char* szRes;
-  if (DBGetContactSettingString(hContact, szModule, szSetting, &dbv))
-	  return mir_strdup(szDef);
-  if(dbv.pszVal)
-	  szRes = mir_strdup(dbv.pszVal);
-  DBFreeVariant(&dbv);
-  return szRes;
-}
-
-
-char *date()
-{
-	setlocale( LC_ALL, "C" );
-	static char d[11];	
-	char *tmp = __DATE__, m[4], mn[3] = "01";
-	m[0]=tmp[0];
-	m[1]=tmp[1];
-	m[2]=tmp[2];
-	if(strstr(m,"Jan"))
-		strcpy(mn,"01");
-	else if(strstr(m,"Feb"))
-		strcpy(mn,"02");
-	else if(strstr(m,"Mar"))
-		strcpy(mn,"03");
-	else if(strstr(m,"Apr"))
-		strcpy(mn,"04");
-	else if(strstr(m,"May"))
-		strcpy(mn,"05");
-	else if(strstr(m,"Jun"))
-		strcpy(mn,"06");
-	else if(strstr(m,"Jul"))
-		strcpy(mn,"07");
-	else if(strstr(m,"Aug"))
-		strcpy(mn,"08");
-	else if(strstr(m,"Sep"))
-		strcpy(mn,"09");
-	else if(strstr(m,"Oct"))
-		strcpy(mn,"10");
-	else if(strstr(m,"Nov"))
-		strcpy(mn,"11");
-	else if(strstr(m,"Dec"))
-		strcpy(mn,"12");
-	d[0]=tmp[7];
-	d[1]=tmp[8];
-	d[2]=tmp[9];
-	d[3]=tmp[10];
-	d[4]='.';
-	d[5]=mn[0];
-	d[6]=mn[1];
-	d[7]='.';
-	if (tmp[4] == ' ')
-		d[8] = '0';
-	else
-		d[8]=tmp[4];
-	d[9]=tmp[5];
-	return d;
-}
-
-void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc)
-{
-	TCHAR str[MAX_PATH+2] = {0}, *tmp;
-	OPENFILENAME ofn={0};
-	TCHAR filter[512], *pfilter;
-	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);
-	ofn.Flags=OFN_EXPLORER;
-	ofn.lpstrTitle=TranslateW(WindowTittle);
-	_tcscpy(filter,TranslateW(szExtDesc));
-	pfilter=filter+_tcslen(filter)+1;
-	_tcscpy(pfilter, szExt);
-	pfilter[_tcslen(pfilter)+1] = '\0';
-	pfilter[_tcslen(pfilter)+2] = '\0';
-	ofn.lpstrFilter=filter;
-	tmp = UniGetContactSettingUtf(0, szGPGModuleName, szSetting, _T(""));
-	_tcscpy(str, tmp);
-	mir_free(tmp);
-	if(_tcslen(str)< 2)
-		str[0] = '\0';
-	ofn.lpstrFile=str;
-	ofn.nMaxFile=_MAX_PATH;
-	ofn.nMaxFileTitle=MAX_PATH;
-	if(!GetOpenFileName(&ofn)) 
-		return;
-	DBWriteContactSettingTString(0, szGPGModuleName, szSetting, str);
-}
-
-TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc, bool save_file)
-{
-	TCHAR *str = new TCHAR [MAX_PATH+2];
-	OPENFILENAME ofn={0};
-	TCHAR filter[512], *pfilter;
-	ofn.lStructSize=CDSIZEOF_STRUCT(OPENFILENAME,lpTemplateName);
-	ofn.Flags=OFN_EXPLORER;
-	ofn.lpstrTitle=TranslateW(WindowTittle);
-	_tcscpy(filter,TranslateW(szExtDesc));
-	pfilter=filter+_tcslen(filter)+1;
-	_tcscpy(pfilter, szExt);
-	pfilter[_tcslen(pfilter)+1] = '\0';
-	pfilter[_tcslen(pfilter)+2] = '\0';
-	ofn.lpstrFilter=filter;
-	_tcscpy(str, _T(""));
-	if(_tcslen(str)< 2)
-		str[0] = '\0';
-	ofn.lpstrFile=str;
-	ofn.nMaxFile=_MAX_PATH;
-	ofn.nMaxFileTitle=MAX_PATH;
-	if(!save_file)
-	{
-		if(!GetOpenFileName(&ofn)) 
-		{
-			delete [] str;
-			return NULL;
-		}
-	}
-	else
-	{
-		if(!GetSaveFileName(&ofn)) 
-		{
-			delete [] str;
-			return NULL;
-		}
-	}
-	return str;
-}
-
-void GetFolderPath(TCHAR *WindowTittle, char *szSetting)
-{
-	BROWSEINFO pbi = {0};
-	pbi.lpszTitle = WindowTittle;
-	pbi.ulFlags = BIF_EDITBOX|BIF_NEWDIALOGSTYLE|BIF_SHAREABLE;
-	LPITEMIDLIST pidl = SHBrowseForFolder(&pbi);
-	if (pidl != 0)
-	{
-		TCHAR path[MAX_PATH];
-		if (SHGetPathFromIDList(pidl, path))
-		{
-			DBWriteContactSettingTString(NULL, szGPGModuleName, "szHomePath", path);
-		}
-		IMalloc * imalloc = 0;
-		if (SUCCEEDED(SHGetMalloc(&imalloc)))
-		{
-			imalloc->Free(pidl);
-			imalloc->Release();
-		}
-	}
-}
-
-int LoadKey(WPARAM w, LPARAM l)
-{
-	void ShowLoadPublicKeyDialog();
-	extern map<int, HANDLE> user_data;
-	extern int item_num;
-	item_num = 0;		 //black magic here
-	user_data[1] = (HANDLE)w;
-	ShowLoadPublicKeyDialog();
-	return 0;
-}
-
-int SendKey(WPARAM w, LPARAM l)
-{
-	HANDLE hContact = (HANDLE)w;
-	if(metaIsProtoMetaContacts(hContact))
-		hContact = metaGetMostOnline(hContact);
-	char *szMessage;
-	{
-		char *proto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-		char setting[64];
-		if(proto)
-		{
-			strcpy(setting, proto);
-			strcat(setting, "_GPGPubKey");
-			szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
-		}
-		if(!szMessage[0])
-		{
-			mir_free(szMessage);
-			szMessage = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-		}
-	}
-	if(szMessage[0])
-	{
-		BYTE enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-		CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)szMessage);
-		HistoryLog(hContact, db_event("Public key sent", 0, 0, DBEF_SENT));
-		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc);
-	}
-	mir_free(szMessage);
-	return 0;
-}
-
-extern HANDLE hLoadPublicKey, hToggleEncryption;
-
-int ToggleEncryption(WPARAM w, LPARAM l)
-{
-	HANDLE hContact = (HANDLE)w;
-	BYTE enc = 0;
-	if(metaIsProtoMetaContacts(hContact))
-		enc = DBGetContactSettingByte(metaGetMostOnline(hContact), szGPGModuleName, "GPGEncryption", 0);
-	else
-		enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-	if(metaIsProtoMetaContacts(hContact))
-	{
-		HANDLE hcnt = NULL;
-		if(MessageBox(0, _T("Do you want to toggle encryption for all subcontacts ?"), _T("Metacontact detected"), MB_YESNO) == IDYES)
-		{
-			int count = metaGetContactsNum(hContact);
-			for(int i = 0; i < count; i++)
-			{
-				hcnt = metaGetSubcontact(hContact, i);
-				if(hcnt)
-					DBWriteContactSettingByte(hcnt, szGPGModuleName, "GPGEncryption", enc?0:1);
-			}
-			DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc?0:1);
-		}
-	}
-	else
-		DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", enc?0:1);
-	void setSrmmIcon(HANDLE hContact);
-	void setClistIcon(HANDLE hContact);
-	setSrmmIcon(hContact);
-	setClistIcon(hContact);
-	enc = enc?0:1;
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.flags = CMIM_NAME;
-	enc?mi.pszName="Turn off GPG encryption":mi.pszName="Turn on GPG encryption";
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
-	return 0;
-}
-
-int OnPreBuildContactMenu(WPARAM w, LPARAM l)
-{
-	HANDLE hContact = (HANDLE)w;
-	if(metaIsProtoMetaContacts(hContact))
-		hContact = metaGetMostOnline(hContact);
-	CLISTMENUITEM mi = {0};
-	mi.cbSize=sizeof(mi);
-	mi.flags = CMIM_NAME;
-	TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-	if(_tcslen(tmp) < 1)
-	{
-		DBDeleteContactSetting(hContact, szGPGModuleName, "GPGEncryption");
-		mi.flags += CMIM_FLAGS | CMIF_GRAYED;
-	}
-	else
-		mi.flags = CMIM_NAME | CMIM_FLAGS;
-	mi.pszName = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)?"Turn off GPG encryption":"Turn on GPG encryption";
-	CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
-	return 0;
-}
-
-
-list<wstring> transfers;
-extern bool bFileTransfers;
-
-int onProtoAck(WPARAM w, LPARAM l)
-{
-	ACKDATA *ack=(ACKDATA*)l;
-	CCSDATA *ccs=(CCSDATA*)ack->lParam;
-
-	if(ack->type == ACKTYPE_FILE && bFileTransfers)
-	{
-		switch(ack->result)
-		{
-		case ACKRESULT_DENIED:	case ACKRESULT_FAILED: 
-			break;
-		case ACKRESULT_SUCCESS:
-			{
-				PROTOFILETRANSFERSTATUS *f = (PROTOFILETRANSFERSTATUS*) ack->hProcess;
-				TCHAR *filename = NULL;
-				if(f->flags & PFTS_UNICODE)
-				{
-					if(f->tszCurrentFile && f->tszCurrentFile[0])
-						filename = mir_wstrdup(f->tszCurrentFile);
-					if(!filename)
-						return 0;
-				}
-				else
-				{
-					if(f->szCurrentFile && f->szCurrentFile[0])
-						filename = mir_utf8decodeT(f->szCurrentFile);
-					if(!filename)
-						return 0;
-				}
-				if(_tcsstr(filename, _T(".gpg"))) //decrypt it
-				{ //process encrypted file
-					if(_waccess(f->tszCurrentFile, 0) == -1)
-					{
-						if(errno == ENOENT)
-							return 0;
-					}
-					string out;
-					DWORD code;
-					pxResult result;
-					wstring cmd = _T(" -o ");
-					wstring file = filename;
-					wstring::size_type p1 = file.rfind(_T(".gpg"));
-					file.erase(p1, _tcslen(_T(".gpg")));
-					if(_waccess(file.c_str(), 0) != -1)
-					{
-						if(MessageBox(0, _T("Target file exists, do you want to replace it ?"), _T("Warning"), MB_YESNO) == IDNO)
-							return 0;
-					}
-					DeleteFile(file.c_str());
-					file.insert(0, _T("\""));
-					file.insert(file.length(), _T("\" "));
-					cmd += file;
-					extern TCHAR *password;
-					{ // password
-						TCHAR *pass = NULL;
-						char *keyid = UniGetContactSettingUtf(ack->hContact, szGPGModuleName, "KeyID", "");
-						if(strlen(keyid) > 0)
-						{
-							string dbsetting = "szKey_";
-							dbsetting += keyid;
-							dbsetting += "_Password";
-							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
-							if(_tcslen(pass) > 0)
-								debuglog<<time_str()<<": info: found password in database for key id: "<<keyid<<", trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";
-						}
-						else
-						{
-							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
-							if(_tcslen(pass) > 0)
-								debuglog<<time_str()<<": info: found password for all keys in database, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";
-						}
-						if(_tcslen(pass) > 0)
-						{
-							cmd += _T("--passphrase \"");
-							cmd += pass;
-							cmd += _T("\" ");
-						}
-						else if(password)
-						{
-							debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with password\n";
-							cmd += _T("--passphrase \"");
-							cmd += password;
-							cmd += _T("\" ");
-						}
-						else
-							debuglog<<time_str()<<": info: passwords not found in database or memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" with out password\n";
-						mir_free(pass);
-						mir_free(keyid);
-					}
-					cmd += _T(" -d \"");
-					cmd += filename;
-					cmd += _T("\"");
-					gpg_execution_params params;
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread *gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread->timed_join(boost::posix_time::minutes(15)))
-					{
-						delete gpg_thread;
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-						return 0;
-					}
-					while(out.find("public key decryption failed: bad passphrase") != string::npos)
-					{
-						extern bool _terminate;
-						extern HANDLE new_key_hcnt;
-						extern boost::mutex new_key_hcnt_mutex;
-						debuglog<<time_str()<<": info: failed to decrypt messaage from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<" password needed, trying to get one\n";
-						if(_terminate)
-							break;
-						{ //save inkey id
-							string::size_type s = out.find(" encrypted with ");
-							s = out.find(" ID ", s);
-							s += strlen(" ID ");
-							string::size_type s2 = out.find(",",s);
-							if(metaIsProtoMetaContacts(ack->hContact))
-								DBWriteContactSettingString(metaGetMostOnline(ack->hContact), szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
-							else
-								DBWriteContactSettingString(ack->hContact, szGPGModuleName, "InKeyID", out.substr(s, s2-s).c_str());
-						}
-						void ShowLoadKeyPasswordWindow();
-						new_key_hcnt_mutex.lock();
-						new_key_hcnt = ack->hContact;
-						ShowLoadKeyPasswordWindow();
-						wstring cmd2 = cmd;
-						if(password)
-						{
-							debuglog<<time_str()<<": info: found password in memory, trying to decrypt message from "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)ack->hContact, GCDNF_TCHAR)<<"\n";
-							wstring tmp = _T("--passphrase \"");
-							tmp += password;
-							tmp += _T("\" ");
-							cmd2.insert(0, tmp);
-						}
-						out.clear();
-						gpg_execution_params params;
-						pxResult result;
-						params.cmd = &cmd2;
-						params.useless = "";
-						params.out = &out;
-						params.code = &code;
-						params.result = &result;
-						gpg_thread = gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-						if(!gpg_thread->timed_join(boost::posix_time::seconds(15)))
-						{
-							delete gpg_thread;
-							TerminateProcess(params.hProcess, 1);
-							params.hProcess = NULL;
-							debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-							DeleteFile(filename);
-							return 0;
-						}
-						if(result == pxNotFound)
-						{
-							DeleteFile(filename);
-							return 0;
-						}
-					}
-					DeleteFile(filename);
-					mir_free(filename);
-			}
-		}
-		break;
-	}
-	}
-	else if(ack->type == ACKTYPE_MESSAGE)
-	{
-		extern std::list<HANDLE> sent_msgs;
-		if(!sent_msgs.empty())
-		{
-			if(ack->result == ACKRESULT_FAILED)
-			{
-				std::list<HANDLE>::iterator it = std::find(sent_msgs.begin(), sent_msgs.end(), ack->hProcess);
-				if(it != sent_msgs.end())
-				{
-					HistoryLog(ack->hContact, db_event("Failed to send encrypted message", 0,0, 0));
-					
-				}
-			}
-			else if(ack->result == ACKRESULT_SUCCESS)
-			{
-				std::list<HANDLE>::iterator it = std::find(sent_msgs.begin(), sent_msgs.end(), ack->hProcess);
-				if(it != sent_msgs.end())
-					sent_msgs.erase(it);
-			}
-		}
-	}
-	return 0;
-}
-
-std::wstring encrypt_file(HANDLE hContact, TCHAR *filename)
-{
-	string out;
-	DWORD code;
-	pxResult result;
-	HANDLE hcnt = metaIsProtoMetaContacts(hContact)?metaGetMostOnline(hContact):hContact;
-	wstring cmd = _T("--batch --yes -r ");
-	char *keyid = UniGetContactSettingUtf(hcnt, szGPGModuleName, "KeyID", "");
-	TCHAR *szKeyid = mir_a2t(keyid);
-	TCHAR *name = _tcsrchr(filename,_T('\\'));
-	if( !name )
-		name = filename;
-	else
-		name++;
-	TCHAR *file_out =  new TCHAR [_tcslen(filename)+4];
-	mir_sntprintf(file_out, _tcslen(name)+7, _T("%s.gpg"), name);
-	cmd += szKeyid;
-	if(DBGetContactSettingByte(hcnt, szGPGModuleName, "bAlwaysTrust", 0))
-		cmd += _T(" --trust-model always ");
-	mir_free(szKeyid);
-	mir_free(keyid);
-	cmd += _T(" -o \"");
-	TCHAR *temp = _tgetenv(_T("TEMP"));
-	cmd += temp;
-	cmd += _T("\\");
-	cmd += file_out;
-	wstring path_out = temp;
-	path_out += _T("\\");
-	path_out += file_out;
-	DeleteFile(path_out.c_str());
-	cmd += _T("\" ");
-	mir_free(temp);
-	cmd += _T(" -e \"");
-	cmd += filename;
-	cmd += _T("\" ");
-	gpg_execution_params params;
-	params.cmd = &cmd;
-	params.useless = "";
-	params.out = &out;
-	params.code = &code;
-	params.result = &result;
-	mir_free(keyid);
-	delete [] file_out;
-	boost::thread *gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-	if(!gpg_thread->timed_join(boost::posix_time::seconds(180)))
-	{
-		delete gpg_thread;
-		TerminateProcess(params.hProcess, 1);
-		params.hProcess = NULL;
-		debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-		return 0;
-	}
-	if(out.find("There is no assurance this key belongs to the named user") != string::npos)
-	{
-		out.clear();
-		if(MessageBox(0, _T("We trying to encrypt with untrusted key, do you want to trust this key permanently ?"), _T("Warning"), MB_YESNO) == IDYES)
-		{
-			DBWriteContactSettingByte(hcnt, szGPGModuleName, "bAlwaysTrust", 1);
-			cmd.insert(0, _T("--trust-model always "));
-			gpg_thread = new boost::thread(boost::bind(&pxEexcute_thread, &params));
-			if(!gpg_thread->timed_join(boost::posix_time::seconds(180)))
-			{
-				delete gpg_thread;
-				TerminateProcess(params.hProcess, 1);
-				params.hProcess = NULL;
-				debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-				return 0;
-			}
-		}
-		else
-			return 0;
-	}
-	return path_out;
-}
-
-//from secureim partially
-int onSendFile(WPARAM w, LPARAM l)
-{
-	if(!bFileTransfers)
-		return CallService(MS_PROTO_CHAINSEND, w, l);
-	CCSDATA *ccs=(CCSDATA*)l;
-	if(isContactSecured(ccs->hContact))
-	{
-		
-		DWORD flags = (DWORD)ccs->wParam; //check for PFTS_UNICODE here
-		int i;
-//		if(flags & PFTS_UNICODE) //this does not work ....
-		if(StriStr(ccs->szProtoService, "/sendfilew"))
-		{
-			TCHAR **file=(TCHAR **)ccs->lParam;
-			for(i = 0; file[i]; i++)
-			{
-				if(_waccess(file[i], 0) == -1)
-					if(errno == ENOENT)
-						return 0; //we do not want to send file unencrypted (sometimes ack have wrong info)
-				if (_tcsstr(file[i],_T(".gpg")))
-					continue;
-				std::wstring path_out = encrypt_file(ccs->hContact, file[i]);
-				mir_free(file[i]);
-				file[i] = mir_tstrdup(path_out.c_str());
-				transfers.push_back(path_out);
-			}
-		}
-		else
-		{
-			char **file = (char**) ccs->lParam;
-			for(i = 0; file[i]; i++)
-			{
-				if(_access(file[i], 0) == -1)
-					if(errno == ENOENT)
-						return 0; //we do not want to send file unencrypted (sometimes ack have wrong info)
-				if (strstr(file[i],".gpg"))
-					continue;
-				TCHAR *tmp = mir_utf8decodeT(file[i]);
-				std::wstring path_out = encrypt_file(ccs->hContact, tmp);
-				mir_free(tmp);
-				char* tmp2 = mir_utf8encodeW(path_out.c_str());
-				mir_free(file[i]);
-				file[i] = tmp2;
-				transfers.push_back(path_out);
-
-			}
-		}
-	}
-	return CallService(MS_PROTO_CHAINSEND, w, l);
-}
-
-void storeOutput(HANDLE ahandle, string *output)
-{
-	BOOL success;
-	char readbuffer[4096] = {0};
-	unsigned long transfered, available;
-	
-	do {
-		PeekNamedPipe(ahandle,NULL,0,NULL,&available,NULL);
-		if (!available)
-			continue;
-		success=ReadFile(ahandle,readbuffer,sizeof(readbuffer),&transfered,NULL);
-		if (success && transfered)
-			output->append(readbuffer, 4096);
-	} while (available>0);
-}
-
-void HistoryLog(HANDLE hContact, db_event evt)
-{
-	DBEVENTINFO Event = {0};
-	Event.cbSize = sizeof(Event);
-	Event.szModule = szGPGModuleName;
-	Event.eventType = evt.eventType;
-	Event.flags = evt.flags;
-	if(!evt.timestamp)
-		Event.timestamp = (DWORD)time(NULL);
-	else
-		Event.timestamp = evt.timestamp;
-	Event.cbBlob = strlen((char*)evt.pBlob)+1;
-	Event.pBlob = (PBYTE)_strdup((char*)evt.pBlob);
-	CallService(MS_DB_EVENT_ADD, (WPARAM)(HANDLE)hContact,(LPARAM)&Event);
-}
-
-static int ControlAddStringUtf(HWND ctrl, DWORD msg, const TCHAR *szString)
-{
-	int item = -1;
-	item = SendMessage(ctrl, msg, 0, (LPARAM)szString);
-	return item;
-}
-
-int ComboBoxAddStringUtf(HWND hCombo, const TCHAR *szString, DWORD data)
-{
-	int item = ControlAddStringUtf(hCombo, CB_ADDSTRING, szString);
-	SendMessage(hCombo, CB_SETITEMDATA, item, data);
-
-	return item;
-}
-
-
-int GetJabberInterface(WPARAM w, LPARAM l) //get interface for all jabber accounts, options later
-{
-	extern list <JabberAccount*> Accounts;
-	void AddHandlers();
-	int count = 0;
-	PROTOACCOUNT **accounts;
-	ProtoEnumAccounts(&count, &accounts);
-	list <JabberAccount*>::iterator p;
-	Accounts.clear();
-	Accounts.push_back(new JabberAccount);
-	p = Accounts.begin();
-	(*p)->setAccountNumber(0);
-	for(int i = 0; i < count; i++) //get only jabber accounts from all accounts
-	{
-		IJabberInterface *JIftmp = getJabberApi(accounts[i]->szModuleName);
-		int a = 0;
-		if(JIftmp)
-		{
-			(*p)->setJabberInterface(JIftmp);
-			if(accounts[i]->tszAccountName)
-			{
-				TCHAR* tmp = mir_tstrdup(accounts[i]->tszAccountName);
-				(*p)->setAccountName(tmp);
-			}
-			else
-			{
-				TCHAR *tmp = mir_a2t(accounts[i]->szModuleName);
-				(*p)->setAccountName(tmp);
-			}
-			(*p)->setAccountNumber(a);
-			a++;
-			Accounts.push_back(new JabberAccount);
-			p++;
-		}
-	}
-	Accounts.pop_back();
-	AddHandlers();
-	return 0;
-}
-
-static JABBER_HANDLER_FUNC SendHandler(IJabberInterface *ji, HXML node, void *pUserData)
-{
-	HXML local_node = node;
-	for(int n = 0; n <= xi.getChildCount(node); n++)
-	{
-		LPCTSTR str = xi.getText(local_node); 
-		LPCTSTR nodename = xi.getName(local_node);
-		if(str)
-		{
-			if(_tcsstr(str, _T("-----BEGIN PGP MESSAGE-----")) && _tcsstr(str, _T("-----END PGP MESSAGE-----")))
-			{
-				wstring data = str;
-				xi.setText(local_node, _T("This message is encrypted."));
-				wstring::size_type p1 = data.find(_T("-----BEGIN PGP MESSAGE-----")) + _tcslen(_T("-----BEGIN PGP MESSAGE-----"));
-				while(data.find(_T("Version: "), p1) != wstring::npos)
-				{
-					p1 = data.find(_T("Version: "), p1);
-					p1 = data.find(_T("\n"), p1);
-				}
-				while(data.find(_T("Comment: "), p1) != wstring::npos)
-				{
-					p1 = data.find(_T("Comment: "), p1);
-					p1 = data.find(_T("\n"), p1);
-				}
-				while(data.find(_T("Encoding: "), p1) != wstring::npos)
-				{
-					p1 = data.find(_T("Encoding: "), p1);
-					p1 = data.find(_T("\n"), p1);
-				}
-				p1+=2;
-				wstring::size_type p2 = data.find(_T("-----END PGP MESSAGE-----"));
-				HXML encrypted_data = xi.addChild(node, _T("x"), data.substr(p1, p2-p1).c_str());
-				xi.addAttr(encrypted_data, _T("xmlns"), _T("jabber:x:encrypted"));
-				return FALSE;
-			}
-		}
-		if(bPresenceSigning && nodename)
-		{
-			if(_tcsstr(nodename, _T("status")))
-			{
-				TCHAR *path_c = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-				wstring path_out = path_c;
-				wstring file = toUTF16(get_random(10));
-				mir_free(path_c);
-				path_out += _T("\\tmp\\");
-				path_out += file;
-				DeleteFile(path_out.c_str());
-				wfstream f(path_out.c_str(), std::ios::out);
-				f<<toUTF8(str).c_str();
-				f.close();
-				if(_waccess(path_out.c_str(), 0) == -1)
-				{
-					if(errno == ENOENT)
-					{
-						debuglog<<time_str()<<": info: Failed to write prescense in file\n";
-						return FALSE;
-					}
-				}
-				{
-					extern TCHAR *password;
-					string out;
-					DWORD code;
-					wstring cmd;
-					{
-						char *inkeyid;
-						{
-							char *proto = ji->Sys()->GetModuleName();
-							char setting[64];
-							strcpy(setting, proto);
-							strcat(setting, "_KeyID");
-							inkeyid = UniGetContactSettingUtf(NULL, szGPGModuleName, setting, "");
-							if(!inkeyid[0])
-							{
-								mir_free(inkeyid);
-								inkeyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", "");
-							}
-						}
-						TCHAR *pass = NULL;
-						if(inkeyid[0])
-						{
-							string dbsetting = "szKey_";
-							dbsetting += inkeyid;
-							dbsetting += "_Password";
-							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, dbsetting.c_str(), _T(""));
-							if(pass[0])
-								debuglog<<time_str()<<": info: found password in database for key id: "<<inkeyid<<", trying to encrypt message from self with password\n";
-						}
-						else
-						{
-							pass = UniGetContactSettingUtf(NULL, szGPGModuleName, "szKeyPassword", _T(""));
-							if(pass[0])
-								debuglog<<time_str()<<": info: found password for all keys in database, trying to encrypt message from self with password\n";
-						}
-						if(pass[0])
-						{
-							cmd += _T("--passphrase \"");
-							cmd += pass;
-							cmd += _T("\" ");
-						}
-						else if(password)
-						{
-							debuglog<<time_str()<<": info: found password in memory, trying to encrypt message from self with password\n";
-							cmd += _T("--passphrase \"");
-							cmd += password;
-							cmd += _T("\" ");
-						}
-						else
-							debuglog<<time_str()<<": info: passwords not found in database or memory, trying to encrypt message from self with out password\n";
-						mir_free(pass);
-						mir_free(inkeyid);
-					}
-					cmd += _T("--local-user ");
-					path_c = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", _T(""));
-					cmd += path_c;
-					cmd += _T(" --default-key ");
-					cmd += path_c;
-					mir_free(path_c);
-					cmd += _T(" --batch --yes -a -s \"");
-					cmd += path_out;
-					cmd += _T("\" ");
-					gpg_execution_params params;
-					pxResult result;
-					params.cmd = &cmd;
-					params.useless = "";
-					params.out = &out;
-					params.code = &code;
-					params.result = &result;
-					boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-					if(!gpg_thread.timed_join(boost::posix_time::seconds(15)))
-					{
-						gpg_thread.~thread();
-						TerminateProcess(params.hProcess, 1);
-						params.hProcess = NULL;
-						debuglog<<time_str()<<"GPG execution timed out, aborted\n";
-					}
-					DeleteFile(path_out.c_str());
-					path_out += _T(".asc");
-					f.open(path_out.c_str(), std::ios::in | std::ios::ate | std::ios::binary);
-					wstring data;
-					if(f.is_open())
-					{
-						std::wifstream::pos_type size = f.tellg();
-						TCHAR *tmp = new TCHAR [(std::ifstream::pos_type)size+(std::ifstream::pos_type)1];
-						f.seekg(0, std::ios::beg);
-						f.read(tmp, size);
-						tmp[size]= '\0';
-						data.append(tmp);
-						delete [] tmp;
-						f.close();
-						DeleteFile(path_out.c_str());
-					}
-					if(data.empty())
-					{
-						debuglog<<time_str()<<": info: Failed to read prescense sign from file\n";
-						return FALSE;
-					}
-					if(data.find(_T("-----BEGIN PGP MESSAGE-----")) != wstring::npos && data.find(_T("-----END PGP MESSAGE-----")) != wstring::npos)
-					{
-						wstring::size_type p1 = data.find(_T("-----BEGIN PGP MESSAGE-----")) + _tcslen(_T("-----BEGIN PGP MESSAGE-----"));
-						if(data.find(_T("Version: "), p1) != wstring::npos)
-						{
-							p1 = data.find(_T("Version: "), p1);
-							p1 = data.find(_T("\n"), p1);
-							if(data.find(_T("Version: "), p1) != wstring::npos)
-							{
-								p1 = data.find(_T("Version: "), p1);
-								p1 = data.find(_T("\n"), p1)+1;
-							}
-							else
-								p1 += 1;
-						}
-						if(data.find(_T("Comment: "), p1) != wstring::npos)
-						{
-							p1 = data.find(_T("Comment: "), p1);
-							p1 = data.find(_T("\n"), p1);
-							if(data.find(_T("Comment: "), p1) != wstring::npos)
-							{
-								p1 = data.find(_T("Comment: "), p1);
-								p1 = data.find(_T("\n"), p1)+1;
-							}
-							else
-								p1 += 1;
-						}
-						else
-							p1+=1;
-						wstring::size_type p2 = data.find(_T("-----END PGP MESSAGE-----"));
-						HXML encrypted_data = xi.addChild(node, _T("x"), data.substr(p1, p2-p1).c_str());
-						xi.addAttr(encrypted_data, _T("xmlns"), _T("jabber:x:signed"));
-					}
-					return FALSE;
-				}
-			}
-		}
-		local_node = xi.getChild(node, n);
-	}
-	return FALSE;
-}
-
-//boost::mutex sign_file_mutex;
-
-static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, void *pUserData)
-{
-	HXML local_node = node;
-	for(int n = 0; n <= xi.getChildCount(node); n++)
-	{
-		LPCTSTR str = xi.getText(local_node); 
-		LPCTSTR nodename = xi.getName(local_node);
-		if(nodename)
-		{
-			if(_tcsstr(nodename, _T("x")))
-			{
-				for(int n = 0; n < xi.getAttrCount(local_node); n++)
-				{
-					LPCTSTR name = xi.getAttrName(local_node, n);
-					LPCTSTR value = xi.getAttrValue(local_node, name);
-					if(_tcsstr(value, _T("jabber:x:signed")))
-					{
-						LPCTSTR data = xi.getText(local_node);
-						wstring sign = _T("-----BEGIN PGP MESSAGE-----\n\n");
-						wstring file = toUTF16(get_random(10));
-						sign += data;
-						sign += _T("\n-----END PGP MESSAGE-----\n");
-						TCHAR *path_c = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-						wstring path_out = path_c;
-						mir_free(path_c);
-						path_out += _T("\\tmp\\");
-						path_out += file;
-//						sign_file_mutex.lock();
-						DeleteFile(path_out.c_str());
-						wfstream f(path_out.c_str(), std::ios::out);
-						while(!f.is_open())
-							f.open(path_out.c_str(), std::ios::out);
-						f<<toUTF8(sign).c_str();
-						f.close();
-						if(_waccess(path_out.c_str(), 0) == -1)
-						{
-							if(errno == ENOENT)
-							{
-//								sign_file_mutex.unlock();
-								debuglog<<time_str()<<": info: Failed to write sign in file\n";
-								return FALSE;
-							}
-						}
-						{ //gpg
-							string out;
-							DWORD code;
-							wstring cmd = _T(" --verify -a \"");
-							cmd += path_out;
-							cmd += _T("\"");
-							gpg_execution_params params;
-							pxResult result;
-							params.cmd = &cmd;
-							params.useless = "";
-							params.out = &out;
-							params.code = &code;
-							params.result = &result;
-							boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-							if(!gpg_thread.timed_join(boost::posix_time::seconds(15)))
-							{
-								gpg_thread.~thread();
-								TerminateProcess(params.hProcess, 1);
-								params.hProcess = NULL;
-								debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-								return FALSE;
-							}
-							if(result == pxNotFound)
-							{
-								return FALSE;
-							}
-							DeleteFile(path_out.c_str());
-							if(out.find("key ID ") != string::npos)
-							{
-								//need to get hcontact here, i can get jid from hxml, and get handle from jid, maybe exists better way ?
-								string::size_type p1 = out.find("key ID ") + strlen("key ID ");
-								string::size_type p2 = out.find("\n", p1);
-								if(p1 != string::npos && p2 != string::npos)
-								{
-									HANDLE hContact = NULL;
-									{
-										extern list <JabberAccount*> Accounts;
-										list <JabberAccount*>::iterator p = Accounts.begin();	
-										for(unsigned int i = 0; i < Accounts.size(); i++, p++)
-										{
-											if(!(*p))
-												break;
-											hContact = (*p)->getJabberInterface()->Sys()->ContactFromJID(xi.getAttrValue(node, _T("from")));
-											if(hContact)
-												hcontact_data[hContact].key_in_prescense = out.substr(p1, p2-p1-1).c_str();
-										}
-									}
-								}
-							}
-						}
-						return FALSE;
-					}
-				}
-			}
-		}
-		local_node = xi.getChild(node, n);
-	}
-	return FALSE;
-}
-
-static JABBER_HANDLER_FUNC MessageHandler(IJabberInterface *ji, HXML node, void *pUserData)
-{
-	return FALSE;
-}
-
-
-
-
-void AddHandlers()
-{
-	extern list<JabberAccount*> Accounts;
-	list<JabberAccount*>::iterator end = Accounts.end();
-	for(list<JabberAccount*>::iterator p = Accounts.begin(); p != end; p++)
-	{
-		if(!(*p))
-			break;
-		if((*p)->getSendHandler() == INVALID_HANDLE_VALUE)
-			(*p)->setSendHandler((*p)->getJabberInterface()->Net()->AddSendHandler((JABBER_HANDLER_FUNC)SendHandler));
-		if((*p)->getPrescenseHandler() == INVALID_HANDLE_VALUE)
-			(*p)->setPrescenseHandler((*p)->getJabberInterface()->Net()->AddPresenceHandler((JABBER_HANDLER_FUNC)PrescenseHandler));
-//		if((*p)->getMessageHandler() == INVALID_HANDLE_VALUE)
-//			(*p)->setMessageHandler((*p)->getJabberInterface()->Net()->AddMessageHandler((JABBER_HANDLER_FUNC)MessageHandler, JABBER_MESSAGE_TYPE_ANY ,NULL,NULL));
-		if(bAutoExchange)
-		{
-			(*p)->getJabberInterface()->Net()->RegisterFeature(_T("GPG_Key_Auto_Exchange:0"), _T("Indicates that gpg installed and configured to public key auto exchange (currently implemented in new_gpg Miranda IM plugin)"));
-			(*p)->getJabberInterface()->Net()->AddFeatures(_T("GPG_Key_Auto_Exchange:0\0\0"));
-		}
-	}
-}
-
-bool isContactSecured(HANDLE hContact)
-{
-	BYTE gpg_enc = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0);
-	if(!gpg_enc)
-	{
-		debuglog<<time_str()<<": encryption is turned off for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";
-		return false;
-	}
-	if(!metaIsProtoMetaContacts(hContact))
-	{
-		TCHAR *key = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-		if(!key[0])
-		{
-			mir_free(key);
-			debuglog<<time_str()<<": encryption is turned off for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";
-			return false;
-		}
-		mir_free(key);
-	}
-	debuglog<<time_str()<<": encryption is turned on for "<<(TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)<<"\n";
-	return true;
-}
-
-bool isContactHaveKey(HANDLE hContact)
-{
-	TCHAR *key = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
-	if(_tcslen(key) > 0)
-	{
-		mir_free(key);
-		return true;
-	}
-	mir_free(key);
-	return false;
-}
-
-bool isGPGKeyExist()
-{
-	TCHAR *id = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", _T(""));
-	char *key = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", "");
-	if(id[0] && key[0])
-	{
-		mir_free(id);
-		mir_free(key);
-		return true;
-	}
-	mir_free(id);
-	mir_free(key);
-	return false;
-}
-bool isGPGValid()
-{
-	TCHAR *tmp;
-	bool gpg_exists = false, is_valid = true;
-	tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T(""));
-	if(_waccess(tmp, 0) != -1)
-		gpg_exists = true;
-	else
-	{
-		mir_free(tmp);
-		TCHAR *path = (TCHAR*)mir_alloc(sizeof(TCHAR)*MAX_PATH);
-		char *mir_path = (char*)mir_alloc(MAX_PATH);
-		CallService(MS_UTILS_PATHTOABSOLUTE, (WPARAM)"\\", (LPARAM)mir_path);
-		SetCurrentDirectoryA(mir_path);
-		tmp = mir_a2t(mir_path);
-		mir_free(mir_path);
-		//mir_realloc(path, (_tcslen(path)+64)*sizeof(TCHAR));
-		TCHAR *gpg_path = (TCHAR*)mir_alloc(sizeof(TCHAR)*MAX_PATH);
-		_tcscpy(gpg_path, tmp);
-		_tcscat(gpg_path, _T("\\GnuPG\\gpg.exe"));
-		mir_free(tmp);
-		if(_waccess(gpg_path, 0) != -1)
-		{
-			gpg_exists = true;
-			_tcscpy(path, _T("GnuPG\\gpg.exe"));
-		}
-		mir_free(gpg_path);
-		tmp = mir_tstrdup(path);
-		mir_free(path);
-	}
-	DWORD len = MAX_PATH;
-	if(gpg_exists)
-	{
-		DBWriteContactSettingTString(NULL, szGPGModuleName, "szGpgBinPath", tmp);
-		string out;
-		DWORD code;
-		wstring cmd = _T("--version");
-		gpg_execution_params params;
-		pxResult result;
-		params.cmd = &cmd;
-		params.useless = "";
-		params.out = &out;
-		params.code = &code;
-		params.result = &result;
-		gpg_valid = true;
-		boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-		if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-		{
-			gpg_thread.~thread();
-			TerminateProcess(params.hProcess, 1);
-			params.hProcess = NULL;
-			debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-		}
-		gpg_valid = false;
-		string::size_type p1 = out.find("(GnuPG) ");
-		if(p1 == string::npos)
-			is_valid = false;
-	}
-	mir_free(tmp); tmp = NULL;
-	if(!gpg_exists)
-	{
-		wstring path_ = _wgetenv(_T("APPDATA"));
-		path_ += _T("\\GnuPG");
-		tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", (TCHAR*)path_.c_str());
-	}
-	if(tmp)
-		mir_free(tmp);
-	return is_valid;
-}
-
-#define NEWTSTR_MALLOC(A) (A==NULL)?NULL:strcpy((char*)mir_alloc(sizeof(char)*(strlen(A)+1)),A)
-
-const bool StriStr(const char *str, const char *substr)
-{
-	bool i = false;
-	char *str_up = NEWTSTR_MALLOC(str);
-	char *substr_up = NEWTSTR_MALLOC(substr);
-
-	CharUpperBuffA(str_up, strlen(str_up));
-	CharUpperBuffA(substr_up, strlen(substr_up));
-
-	if(strstr (str_up, substr_up))
-		i = true;
-
-	mir_free(str_up);
-	mir_free(substr_up);
-	
-	return i;
-}
-
-bool IsOnline(HANDLE hContact)
-{
-	if(DBGetContactSettingByte(hContact, szGPGModuleName, "Status", 0) == ID_STATUS_OFFLINE)
-		return false;
-	return true;
-}
-
-//from secureim
-#include <process.h>
-
-struct TFakeAckParams {
-	inline TFakeAckParams( HANDLE p1, HANDLE p2, LONG p3, LPCSTR p4 ) :
-		hEvent( p1 ),
-		hContact( p2 ),
-		id( p3 ),
-		msg( p4 )
-		{}
-
-	HANDLE	hEvent;
-	HANDLE	hContact;
-	LONG	id;
-	LPCSTR	msg;
-};
-
-int SendBroadcast( HANDLE hContact, int type, int result, HANDLE hProcess, LPARAM lParam ) {
-	ACKDATA ack;
-	memset(&ack,0,sizeof(ack));
-	ack.cbSize = sizeof( ACKDATA );
-	ack.szModule = 	(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-	ack.hContact = hContact;
-	ack.type = type;
-	ack.result = result;
-	ack.hProcess = hProcess;
-	ack.lParam = lParam;
-	return CallService( MS_PROTO_BROADCASTACK, 0, ( LPARAM )&ack );
-}
-
-
-
-unsigned __stdcall sttFakeAck( LPVOID param ) {
-
-	TFakeAckParams* tParam = ( TFakeAckParams* )param;
-	WaitForSingleObject( tParam->hEvent, INFINITE );
-
-	Sleep( 100 );
-	if ( tParam->msg == NULL )
-		SendBroadcast( tParam->hContact, ACKTYPE_MESSAGE, ACKRESULT_SUCCESS, ( HANDLE )tParam->id, 0 );
-	else
-		SendBroadcast( tParam->hContact, ACKTYPE_MESSAGE, ACKRESULT_FAILED, ( HANDLE )tParam->id, LPARAM( tParam->msg ));
-
-	CloseHandle( tParam->hEvent );
-	delete tParam;
-
-	return 0;
-}
-
-
-int returnNoError(HANDLE hContact) {
-	HANDLE hEvent = CreateEvent( NULL, TRUE, FALSE, NULL );
-	unsigned int tID;
-	CloseHandle( (HANDLE) _beginthreadex(NULL, 0, sttFakeAck, new TFakeAckParams(hEvent,hContact,777,0), 0, &tID) );
-	SetEvent( hEvent );
-	return 777;
-}
-// end from secureim
-
-
-string toUTF8(wstring str)
-{
-	string ustr;
-	try{
-	utf8::utf16to8(str.begin(), str.end(), back_inserter(ustr));
-	}
-	catch(const utf8::exception& e)
-	{
-		debuglog<<std::string("utf8cpp encoding exception: ")+(char*)e.what();
-	    //TODO
-	}
-	return ustr;
-}
-
-
-
-wstring toUTF16(string str) //convert as much as possible
-{
-	wstring ustr;
-	string tmpstr;
-	try{
-	utf8::replace_invalid(str.begin(), str.end(), back_inserter(tmpstr));
-	utf8::utf8to16(tmpstr.begin(), tmpstr.end(), back_inserter(ustr));
-	}
-	catch(const utf8::exception& e)
-	{
-		debuglog<<std::string("utf8cpp decoding exception: ")+(char*)e.what();
-	    //TODO
-	}
-	return ustr;
-}
-
-string get_random(int length)
-{
-	string chars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890");
-	string data;
-	boost::random_device rng;
-	boost::variate_generator<boost::random_device&, boost::uniform_int<>> gen(rng, boost::uniform_int<>(0, chars.length()-1));
-	for(int i = 0; i < length; ++i) 
-        data += chars[gen()];
-	return data;
-}
-
-void send_encrypted_msgs_thread(HANDLE hContact)
-{
-	while(true)
-	{
-		char *key = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", "");
-		while(!isContactSecured(hContact))
-			boost::this_thread::sleep(boost::posix_time::seconds(1));
-		if(!hcontact_data[hContact].msgs_to_send.empty())
-		{
-			boost::this_thread::sleep(boost::posix_time::seconds(1));
-			list<string>::iterator end = hcontact_data[hContact].msgs_to_send.end();
-			extern std::list<HANDLE> sent_msgs;
-			for(list<string>::iterator p = hcontact_data[hContact].msgs_to_send.begin(); p != end; ++p)
-			{
-				sent_msgs.push_back((HANDLE)CallContactService(hContact, PSS_MESSAGE, (WPARAM)PREF_UTF, (LPARAM)p->c_str()));
-				HistoryLog(hContact, db_event((char*)p->c_str(),0,0, DBEF_SENT));
-				boost::this_thread::sleep(boost::posix_time::seconds(1));
-			}
-			hcontact_data[hContact].msgs_to_send.clear();
-			return;
-		}
-		else
-			return;
-	}
-}
-
-string time_str()
-{
-	boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
-	return (string)boost::posix_time::to_simple_string(now);
-}
-
-int handleEnum(const char *szSetting, LPARAM lParam)
-{
-	if(!*(bool*)lParam && szSetting[0] && StriStr(szSetting, "tabsrmm"))
-	{
-		bool f = false, *found = (bool*)lParam;
-		f = !DBGetContactSettingByte(NULL, "PluginDisable", szSetting, 0); 
-		if(f)
-			*found = f;
-	}
-	return 0;
-}
-
-bool isTabsrmmUsed()
-{
-	DBCONTACTENUMSETTINGS enm = {0};
-	bool found = false;
-	enm.lParam = (LPARAM)&found;
-	enm.pfnEnumProc = (DBSETTINGENUMPROC)&handleEnum;
-	enm.szModule = "PluginDisable";
-	if(CallService(MS_DB_CONTACT_ENUMSETTINGS, (WPARAM)NULL, (LPARAM)&enm) == -1)
-		return false;
-
-	return found;
-}
-
-
-int ExportGpGKeys(WPARAM w, LPARAM l)
-{
-	TCHAR *p = GetFilePath(_T("Choose file to export public keys"), _T("*"), _T("Any file"), true);
-	if(!p || !p[0])
-	{
-		delete [] p;
-		//TODO: handle error
-		return 1;
-	}
-	char *path = mir_t2a(p);
-	delete [] p;
-	std::ofstream file;
-	file.open(path, std::ios::trunc | std::ios::out);
-	mir_free(path);
-	int exported_keys = 0;
-	if(!file.is_open())
-		return 1; //TODO: handle error
-	for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0))
-	{
-		char *k = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", "");
-		if(!k[0])
-		{
-			mir_free(k);
-			continue;
-		}
-		std::string key = k;
-		mir_free(k);
-		
-		const char* proto = (const char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-		std::string id = "Comment: login ";
-		const char * uid = (const char*)CallProtoService(proto, PS_GETCAPS,  (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
-		DBVARIANT dbv = {0};
-		DBCONTACTGETSETTING dbcgs = {0};
-		dbcgs.pValue = &dbv;
-		dbcgs.szModule = proto;
-		dbcgs.szSetting = uid;
-		CallService(MS_DB_CONTACT_GETSETTING, 0, (LPARAM)&dbcgs);
-		switch(dbcgs.pValue->type)
-		{
-		case DBVT_DELETED:
-			continue;
-			break;
-		case DBVT_BYTE:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->bVal);
-				id += _id;
-			}
-			break;
-		case DBVT_WORD:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->wVal);
-				id += _id;
-			}
-			break;
-		case DBVT_DWORD:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->dVal);
-				id += _id;
-			}
-			break;
-		case DBVT_ASCIIZ:
-			{
-				id += dbcgs.pValue->pszVal;
-				CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			}
-			break;
-		case DBVT_UTF8:
-			{
-				char *tmp = mir_utf8decodeA(dbcgs.pValue->pszVal);
-				if(tmp[0])
-					id += tmp;
-				mir_free(tmp);
-				CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			}
-			break;
-		case DBVT_BLOB:
-			//TODO
-			CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			break;
-		case DBVT_WCHAR:
-			//TODO
-			CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			break;
-		}
-		id += " contact_id ";
-		ZeroMemory(&dbv, sizeof(dbv));
-		ZeroMemory(&dbcgs, sizeof(dbcgs));
-		dbcgs.pValue = &dbv;
-		dbcgs.szModule = proto;
-		dbcgs.szSetting = uid;
-		CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&dbcgs);
-		switch(dbcgs.pValue->type)
-		{
-		case DBVT_DELETED:
-			continue;
-			break;
-		case DBVT_BYTE:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->bVal);
-				id += _id;
-			}
-			break;
-		case DBVT_WORD:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->wVal);
-				id += _id;
-			}
-			break;
-		case DBVT_DWORD:
-			{
-				char _id[64];
-				mir_snprintf(_id, 63, "%d", dbcgs.pValue->dVal);
-				id += _id;
-			}
-			break;
-		case DBVT_ASCIIZ:
-			{
-				id += dbcgs.pValue->pszVal;
-				CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			}
-			break;
-		case DBVT_UTF8:
-			{
-				char *tmp = mir_utf8decodeA(dbcgs.pValue->pszVal);
-				if(tmp[0])
-					id += tmp;
-				mir_free(tmp);
-				CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			}
-			break;
-		case DBVT_BLOB:
-			//TODO
-			CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			break;
-		case DBVT_WCHAR:
-			//TODO
-			CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-			break;
-		}
-		std::string::size_type p1 = key.find("-----BEGIN PGP PUBLIC KEY BLOCK-----");
-		if(p1 == std::string::npos)
-			continue;
-		p1 += strlen("-----BEGIN PGP PUBLIC KEY BLOCK-----");
-		p1 ++;
-		id += '\n';
-		key.insert(p1, id);
-		file<<key;
-		file<<std::endl;
-		exported_keys++;
-	}
-	if(file.is_open())
-		file.close();
-	char msg[512];
-	mir_snprintf(msg, 511, "we have succesfully exported %d keys", exported_keys);
-	MessageBoxA(NULL, msg, Translate("Keys export result"), MB_OK);
-	return 0;
-}
-
-int ImportGpGKeys(WPARAM w, LPARAM l)
-{
-	TCHAR *p = GetFilePath(_T("Choose file to import keys from"), _T("*"), _T("Any file"));
-	if(!p || !p[0])
-	{
-		delete [] p;
-		//TODO: handle error
-		return 1;
-	}
-	char *path = mir_t2a(p);
-	delete [] p;
-	std::ifstream file;
-	file.open(path, std::ios::in);
-	mir_free(path);
-	if(!file.is_open())
-		return 1; //TODO: handle error
-	PROTOACCOUNT **accs;
-	int acc_count = 0, processed_keys = 0;
-	ProtoEnumAccounts(&acc_count, &accs);
-	char line[256];
-	file.getline(line, 255);
-	if(!strstr(line, "-----BEGIN PGP PUBLIC KEY BLOCK-----"))
-		return 1; //TODO: handle error
-	std::string key, login, contact_id;
-	key += line;
-	key += '\n';
-	while(file.is_open() && !file.eof())
-	{
-		file.getline(line, 255);
-		key += line;
-		key += '\n';
-		if(strstr(line, "-----END PGP PUBLIC KEY BLOCK-----"))
-		{ //TODO: parse key
-			std::string::size_type p1 = 0, p2 = 0;
-			p1 = key.find("Comment: login ");
-			p1 += strlen("Comment: login ");
-			p2 = key.find(" contact_id ");
-			login = key.substr(p1, p2-p1);
-			p2 += strlen(" contact_id ");
-			p1 = key.find("\n", p2);
-			contact_id = key.substr(p2, p1-p2);
-			p1 = key.find("Comment: login ");
-			p2 = key.find("\n", p1);
-			p2++;
-			key.erase(p1, p2-p1);
-			std::string acc;
-			for(int i = 0; i < acc_count; i++)
-			{
-				if(acc.length())
-					break;
-				const char * uid = (const char*)CallProtoService(accs[i]->szModuleName, PS_GETCAPS,  (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
-				DBVARIANT dbv = {0};
-				DBCONTACTGETSETTING dbcgs = {0};
-				dbcgs.pValue = &dbv;
-				dbcgs.szModule = accs[i]->szModuleName;
-				dbcgs.szSetting = uid;
-				CallService(MS_DB_CONTACT_GETSETTING, 0, (LPARAM)&dbcgs);
-				std::string id;
-				switch(dbcgs.pValue->type)
-				{
-				case DBVT_DELETED:
-					continue;
-					break;
-				case DBVT_BYTE:
-					{
-						char _id[64];
-						mir_snprintf(_id, 63, "%d", dbcgs.pValue->bVal);
-						id += _id;
-						if(id == login)
-							acc = accs[i]->szModuleName;
-					}
-					break;
-				case DBVT_WORD:
-					{
-						char _id[64];
-						mir_snprintf(_id, 63, "%d", dbcgs.pValue->wVal);
-						id += _id;
-						if(id == login)
-							acc = accs[i]->szModuleName;
-					}
-					break;
-				case DBVT_DWORD:
-					{
-						char _id[64];
-						mir_snprintf(_id, 63, "%d", dbcgs.pValue->dVal);
-						id += _id;
-						if(id == login)
-							acc = accs[i]->szModuleName;
-					}
-					break;
-				case DBVT_ASCIIZ:
-					{
-						id += dbcgs.pValue->pszVal;
-						CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-						if(id == login)
-							acc = accs[i]->szModuleName;
-					}
-					break;
-				case DBVT_UTF8:
-					{
-						char *tmp = mir_utf8decodeA(dbcgs.pValue->pszVal);
-						if(tmp[0])
-							id += tmp;
-						mir_free(tmp);
-						CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-						if(id == login)
-							acc = accs[i]->szModuleName;
-					}
-					break;
-				case DBVT_BLOB:
-					//TODO
-					CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-					break;
-				case DBVT_WCHAR:
-					//TODO
-					CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-					break;
-				}
-			}
-			if(acc.length())
-			{
-				const char * uid = (const char*)CallProtoService(acc.c_str(), PS_GETCAPS,  (WPARAM)PFLAG_UNIQUEIDSETTING, 0);
-				for(HANDLE hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, (LPARAM)acc.c_str()); hContact; hContact = (HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, (LPARAM)acc.c_str()))
-				{
-					DBVARIANT dbv = {0};
-					DBCONTACTGETSETTING dbcgs = {0};
-					dbcgs.pValue = &dbv;
-					dbcgs.szModule = acc.c_str();
-					dbcgs.szSetting = uid;
-					CallService(MS_DB_CONTACT_GETSETTING, (WPARAM)hContact, (LPARAM)&dbcgs);
-					std::string id;
-					bool found = false;
-					switch(dbcgs.pValue->type)
-					{
-					case DBVT_DELETED:
-						continue;
-						break;
-					case DBVT_BYTE:
-						{
-							char _id[64];
-							mir_snprintf(_id, 63, "%d", dbcgs.pValue->bVal);
-							id += _id;
-							if(id == contact_id)
-								found = true;
-						}
-						break;
-					case DBVT_WORD:
-						{
-							char _id[64];
-							mir_snprintf(_id, 63, "%d", dbcgs.pValue->wVal);
-							id += _id;
-							if(id == contact_id)
-								found = true;
-						}
-						break;
-					case DBVT_DWORD:
-						{
-							char _id[64];
-							mir_snprintf(_id, 63, "%d", dbcgs.pValue->dVal);
-							id += _id;
-							if(id == contact_id)
-								found = true;
-						}
-						break;
-					case DBVT_ASCIIZ:
-						{
-							id += dbcgs.pValue->pszVal;
-							CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-							if(id == contact_id)
-								found = true;
-						}
-						break;
-					case DBVT_UTF8:
-						{
-							char *tmp = mir_utf8decodeA(dbcgs.pValue->pszVal);
-							if(tmp[0])
-								id += tmp;
-							mir_free(tmp);
-							CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-							if(id == contact_id)
-								found = true;
-						}
-						break;
-					case DBVT_BLOB:
-						//TODO
-						CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-						break;
-					case DBVT_WCHAR:
-						//TODO
-						CallService(MS_DB_CONTACT_FREEVARIANT, 0, (LPARAM)&dbv);
-						break;
-					}
-					if(found)
-					{
-						wstring cmd;
-						TCHAR tmp2[MAX_PATH] = {0};
-						TCHAR *ptmp;
-						string output;
-						DWORD exitcode;
-						{
-							HANDLE hcnt = hContact;
-							ptmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T(""));
-							_tcscpy(tmp2, ptmp);
-							mir_free(ptmp);
-							_tcscat(tmp2, _T("\\"));
-							_tcscat(tmp2, _T("temporary_exported.asc"));
-							DeleteFile(tmp2);
-							wfstream f(tmp2, std::ios::out);
-							f<<toUTF16(key).c_str();
-							f.close();
-							cmd += _T(" --batch ");
-							cmd += _T(" --import \"");
-							cmd += tmp2;
-							cmd += _T("\"");
-						}
-						gpg_execution_params params;
-						pxResult result;
-						params.cmd = &cmd;
-						params.useless = "";
-						params.out = &output;
-						params.code = &exitcode;
-						params.result = &result;
-						boost::thread gpg_thread(boost::bind(&pxEexcute_thread, &params));
-						if(!gpg_thread.timed_join(boost::posix_time::seconds(10)))
-						{
-							gpg_thread.~thread();
-							TerminateProcess(params.hProcess, 1);
-							params.hProcess = NULL;
-							debuglog<<time_str()<<": GPG execution timed out, aborted\n";
-							break;
-						}
-						if(result == pxNotFound)
-							break;
-						if(result == pxSuccess)
-							processed_keys++;
-						{
-							if(output.find("already in secret keyring") != string::npos)
-							{
-								MessageBox(0, _T("Key already in scret key ring."), _T("Info"), MB_OK);
-								DeleteFile(tmp2);
-								break;
-							}
-							char *tmp2;
-							string::size_type s = output.find("gpg: key ") + strlen("gpg: key ");
-							string::size_type s2 = output.find(":", s);
-							tmp2 = new char [output.substr(s,s2-s).length()+1];
-							strcpy(tmp2, output.substr(s,s2-s).c_str());
-							mir_utf8decode(tmp2, 0);
-							DBWriteContactSettingString(hContact, szGPGModuleName, "KeyID", tmp2);
-							mir_free(tmp2);
-							s = output.find("“", s2);
-							if(s == string::npos)
-							{
-								s = output.find("\"", s2);
-								s += 1;
-							}
-							else
-								s += 3;
-							if((s2 = output.find("(", s)) == string::npos)
-								s2 = output.find("<", s);
-							else if(s2 > output.find("<", s))
-								s2 = output.find("<", s);
-							if(s2 != string::npos)
-							{
-								tmp2 = new char [output.substr(s,s2-s-1).length()+1];
-								strcpy(tmp2, output.substr(s,s2-s-1).c_str());
-								mir_utf8decode(tmp2, 0);
-								if(hContact)
-								{
-									DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainName", output.substr(s,s2-s-1).c_str());
-								}
-								mir_free(tmp2);
-								if((s = output.find(")", s2)) == string::npos)
-									s = output.find(">", s2);
-								else if(s > output.find(">", s2))
-									s = output.find(">", s2);
-								s2++;
-								if(output[s] == ')')
-								{
-									tmp2 = new char [output.substr(s2,s-s2).length()+1];
-									strcpy(tmp2, output.substr(s2,s-s2).c_str());
-									mir_utf8decode(tmp2, 0);
-									if(hContact)
-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyComment", output.substr(s2,s-s2).c_str());
-									mir_free(tmp2);
-									s+=3;
-									s2 = output.find(">", s);
-									tmp2 = new char [output.substr(s,s2-s).length()+1];
-									strcpy(tmp2, output.substr(s,s2-s).c_str());
-									mir_utf8decode(tmp2, 0);
-									if(hContact)
-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s,s2-s).c_str());
-									mir_free(tmp2);
-								}
-								else
-								{
-									tmp2 = new char [output.substr(s2,s-s2).length()+1];
-									strcpy(tmp2, output.substr(s2,s-s2).c_str());
-									mir_utf8decode(tmp2, 0);
-									if(hContact)
-										DBWriteContactSettingString(hContact, szGPGModuleName, "KeyMainEmail", output.substr(s2,s-s2).c_str());
-									mir_free(tmp2);
-								}
-							}
-							DBWriteContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 1);
-							DBWriteContactSettingTString(hContact, szGPGModuleName, "GPGPubKey", toUTF16(key).c_str());
-						}
-						DeleteFile(tmp2);
-						break;
-					}
-				}
-			}
-			key.clear();
-		}
-	}
-	if(file.is_open())
-		file.close();
-	char msg[512];
-	mir_snprintf(msg, 511, "we have succesfully processed %d keys", processed_keys);
-	MessageBoxA(NULL, msg, Translate("Keys import result"), MB_OK);
-	return 0;
-}
-\ No newline at end of file
diff --git a/plugins/new_gpg/src/utilities.h b/plugins/new_gpg/src/utilities.h
deleted file mode 100755
index 30e9f68bb2..0000000000
--- a/plugins/new_gpg/src/utilities.h
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright � 2010-2012 sss
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-
-#ifndef UTILITIES_H
-#define UTILITIES_H
-TCHAR* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, TCHAR* szDef);
-char* __stdcall UniGetContactSettingUtf(HANDLE hContact, const char *szModule,const char* szSetting, char* szDef);
-void GetFilePath(TCHAR *WindowTittle, char *szSetting, TCHAR *szExt, TCHAR *szExtDesc);
-TCHAR *GetFilePath(TCHAR *WindowTittle, TCHAR *szExt, TCHAR *szExtDesc, bool save_file = false);
-void GetFolderPath(TCHAR *WindowTittle, char *szSetting);
-
-void storeOutput(HANDLE ahandle, string *output);
-
-int ComboBoxAddStringUtf(HWND hCombo, const TCHAR *szString, DWORD data);
-bool isContactSecured(HANDLE hContact);
-bool isContactHaveKey(HANDLE hContact);
-bool isTabsrmmUsed();
-bool isGPGKeyExist();
-bool isGPGValid();
-const bool StriStr(const char *str, const char *substr);
-string toUTF8(wstring str);
-wstring toUTF16(string str);
-string get_random(int length);
-string time_str();
-
-struct db_event : public DBEVENTINFO
-{
-public:
-	db_event(char* msg)
-	{
-		eventType = EVENTTYPE_MESSAGE;
-		flags = 0;
-		timestamp = 0;
-		szModule = 0;
-		cbSize = 0;
-		cbBlob = strlen(msg)+1;
-		pBlob = (PBYTE)msg;
-	}
-	db_event(char* msg, DWORD time)
-	{
-		cbBlob = strlen(msg)+1;
-		pBlob = (PBYTE)msg;
-		eventType = EVENTTYPE_MESSAGE;
-		flags = 0;
-		timestamp = time;
-		szModule = 0;
-		cbSize = 0;
-	}
-	db_event(char* msg, DWORD time, int type)
-	{
-		cbBlob = strlen(msg)+1;
-		pBlob = (PBYTE)msg;
-		if(type)
-			eventType = type;
-		else
-			eventType = EVENTTYPE_MESSAGE;
-		flags = 0;
-		timestamp = time;
-		szModule = 0;
-		cbSize = 0;
-	}
-	db_event(char* msg, int type)
-	{
-		cbBlob = strlen(msg)+1;
-		pBlob = (PBYTE)msg;
-		flags = 0;
-		if(type)
-			eventType = type;
-		else
-			eventType = EVENTTYPE_MESSAGE;
-		timestamp = 0;
-		szModule = 0;
-		cbSize = 0;
-	}
-	db_event(char* msg, DWORD time, int type, DWORD _flags)
-	{
-		cbBlob = strlen(msg)+1;
-		pBlob = (PBYTE)msg;
-		if(type)
-			eventType = type;
-		else
-			eventType = EVENTTYPE_MESSAGE;
-		flags = _flags;
-		timestamp = time;
-		szModule = 0;
-		cbSize = 0;
-	}
-};
-void HistoryLog(HANDLE, db_event);
-
-#endif