diff --git a/packages/fcl-base/src/inifiles.pp b/packages/fcl-base/src/inifiles.pp
index 2039fa245b..753bf5bfb3 100644
--- a/packages/fcl-base/src/inifiles.pp
+++ b/packages/fcl-base/src/inifiles.pp
@@ -620,6 +620,8 @@ constructor TIniFile.Create(const AFileName: string; AEscapeLineFeeds : Boolean
 var
   slLines: TStringList;
 begin
+  If Not (self is TMemIniFile) then
+    StripQuotes:=True;
   inherited Create(AFileName,AEscapeLineFeeds);
   FStream := nil;
   slLines := TStringList.Create;
@@ -730,7 +732,7 @@ begin
                // Joost, 2-jan-2007: The check (J>1) is there for the case that
                // the value consist of a single double-quote character. (see
                // mantis bug 6555)
-               If (J>1) and (sValue[1]='"') and (sValue[J]='"') then
+               If (J>1) and ((sValue[1] in ['"','''']) and (sValue[J]=sValue[1])) then
                  sValue:=Copy(sValue,2,J-2);
                end;  
            end;