diff --git a/Lib/Protocols/IdPOP3.pas b/Lib/Protocols/IdPOP3.pas
index 78969ce7a..a74d16cd5 100644
--- a/Lib/Protocols/IdPOP3.pas
+++ b/Lib/Protocols/IdPOP3.pas
@@ -587,6 +587,18 @@ procedure TIdPOP3.SetSASLMechanisms(AValue: TIdSASLEntries);
   FSASLMechanisms.Assign(AValue);
 end;
 
+procedure TIdPOP3.SendUTF8IfAdvertised;
+var
+  Capa : string;
+begin
+  for Capa in FCapabilities do
+    if TextStartsWith(Capa, 'UTF8 ') then
+    begin
+      SendCmd('UTF8','');
+      exit;
+    end;
+end;
+
 procedure TIdPOP3.Connect;
 var
   S: String;
@@ -619,6 +631,7 @@ procedure TIdPOP3.Connect;
     if FAutoLogin then begin
       Login;
     end;
+    SendUTF8IfAdvertised;
   except
     Disconnect(False);
     raise;