diff --git a/TODO.txt b/TODO.txt
index 0460f2054..d058f2546 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -35,7 +35,7 @@ E        [ ] some widgets in the GUI do not follow the system style => GUI looks
 E        [ ] recommended friends messages have embedded buttons of wrong size.  Use RSLinks instead!
 E        [ ] "Friends details" should show both PGP key and RS certs in different tabs with appropriate names.
              It should specify clearly which one should be used to make friends.
-E        [ ] addFriend does not work when the cert contains signatures.
+E        [X] addFriend does not work when the cert contains signatures.
 E        [ ] PGP signatures are not transmited by discovery2. 
       
        Messages
diff --git a/libretroshare/src/pgp/pgphandler.cc b/libretroshare/src/pgp/pgphandler.cc
index e657a5ead..1d3bfd57e 100644
--- a/libretroshare/src/pgp/pgphandler.cc
+++ b/libretroshare/src/pgp/pgphandler.cc
@@ -987,12 +987,7 @@ bool PGPHandler::LoadCertificateFromString(const std::string& pgp_cert,RsPgpId&
 	//
 	ops_validate_result_t* result=(ops_validate_result_t*)ops_mallocz(sizeof *result);
 
-	if(!ops_validate_key_signatures(result,keydata,tmp_keyring,cb_get_passphrase)) 
-	{
-		std::cerr << "Cannot validate self-signature for this certificate. Format error?" << std::endl;
-		error_string = "Cannot validate self signature for this certificate. Format error?" ;
-		return false ;
-	}
+    ops_validate_key_signatures(result,keydata,tmp_keyring,cb_get_passphrase) ;
 
 	bool found = false ;
 
@@ -1265,7 +1260,7 @@ bool PGPHandler::decryptTextFromFile(const RsPgpId&,std::string& text,const std:
 
 	if (f == NULL)
 	{
-		std::cerr << "Cannot open file " << inputfile << " for read." << std::endl;
+        std::cerr << "Cannot open file " << inputfile << " for read." << std::endl;
 		return false;
 	}