diff --git a/src/MiniExcel/Csv/CsvConfiguration.cs b/src/MiniExcel/Csv/CsvConfiguration.cs
index 90e7a1ab..afee65fa 100644
--- a/src/MiniExcel/Csv/CsvConfiguration.cs
+++ b/src/MiniExcel/Csv/CsvConfiguration.cs
@@ -10,6 +10,7 @@ public class CsvConfiguration : Configuration
 
         public char Seperator { get; set; } = ',';
         public string NewLine { get; set; } = "\r\n";
+        public bool ReadLineBreaksWithinQuotes { get; set; } = true;
         public bool ReadEmptyStringAsNull { get; set; } = false;
         public bool AlwaysQuote { get; set; } = false;
         public Func<string, string[]> SplitFn { get; set; }
diff --git a/src/MiniExcel/Csv/CsvReader.cs b/src/MiniExcel/Csv/CsvReader.cs
index 9ca5524d..59db51d6 100644
--- a/src/MiniExcel/Csv/CsvReader.cs
+++ b/src/MiniExcel/Csv/CsvReader.cs
@@ -33,7 +33,16 @@ public IEnumerable<IDictionary<string, object>> Query(bool useHeaderRow, string
                 string row;
                 for (var rowIndex = 1; (row = reader.ReadLine()) != null; rowIndex++)
                 {
-                    read = Split(row);
+
+                    string finalRow = row;
+                    if (_config.ReadLineBreaksWithinQuotes)
+                    {
+                        while (finalRow.Count(c => c == '"') % 2 != 0)
+                        {
+                            finalRow += string.Concat( _config.NewLine, reader.ReadLine());
+                        }
+                    }
+                    read = Split(finalRow);
 
                     // invalid row check
                     if (read.Length < headRows.Count)
diff --git a/tests/MiniExcelTests/MiniExcelIssueTests.cs b/tests/MiniExcelTests/MiniExcelIssueTests.cs
index 498fa29f..ad5609c8 100644
--- a/tests/MiniExcelTests/MiniExcelIssueTests.cs
+++ b/tests/MiniExcelTests/MiniExcelIssueTests.cs
@@ -3183,10 +3183,10 @@ public void Issue149()
         {
             var chars = new char[] {'\u0000','\u0001','\u0002','\u0003','\u0004','\u0005','\u0006','\u0007','\u0008',
                 '\u0009', //<HT>
-	           '\u000A', //<LF>
-	           '\u000B','\u000C',
+               '\u000A', //<LF>
+               '\u000B','\u000C',
                 '\u000D', //<CR>
-	           '\u000E','\u000F','\u0010','\u0011','\u0012','\u0013','\u0014','\u0015','\u0016',
+               '\u000E','\u000F','\u0010','\u0011','\u0012','\u0013','\u0014','\u0015','\u0016',
                 '\u0017','\u0018','\u0019','\u001A','\u001B','\u001C','\u001D','\u001E','\u001F','\u007F'
             }.Select(s => s.ToString()).ToArray();
 
@@ -3526,5 +3526,94 @@ public void Issue585()
             var items3 = MiniExcel.Query<Issue585VO3>(path);
             Assert.Equal(2, items3.Count());
         }
+
+
+        class Issue507V01
+        {
+            public string A { get; set; }
+            public DateTime B { get; set; }
+            public string C { get; set; }
+            public int D { get; set; }
+        }
+
+        class Issue507V02 {
+            public DateTime B { get; set; }
+            public int D { get; set; }
+        }
+
+        [Fact]
+        public void Issue507_1()
+        {
+            //Problem with multi-line when using Query func
+            //https://github.com/mini-software/MiniExcel/issues/507
+
+            var path = Path.Combine(Path.GetTempPath(), string.Concat( nameof(MiniExcelIssueTests),"_", nameof(Issue507_1), ".csv" ));
+            var values = new Issue507V01[]
+            {
+                new() { A = "Github", B = DateTime.Parse("2021-01-01"), C = "abcd", D = 123 },
+                new() { A = "Microsoft \nTest 1", B = DateTime.Parse("2021-02-01"), C = "efgh", D = 123 },
+                new() { A = "Microsoft \rTest 2", B = DateTime.Parse("2021-02-01"), C = "ab\nc\nd", D = 123 },
+                new() { A = "Microsoft\"\" \r\nTest\n3", B = DateTime.Parse("2021-02-01"), C = "a\"\"\nb\n\nc", D = 123 },
+            };
+
+            var config = new CsvConfiguration() {
+                //AlwaysQuote = true,
+                ReadLineBreaksWithinQuotes = true,
+            };
+
+            // create
+            using (var stream = File.Create(path))
+            {
+                stream.SaveAs(values, excelType: ExcelType.CSV, configuration: config);
+            }
+
+            // read
+            var getRowsInfo = MiniExcel.Query<Issue507V01>(path, excelType: ExcelType.CSV, configuration: config).ToArray();
+            
+            Assert.Equal(values.Length, getRowsInfo.Count());
+            
+            Assert.Equal("Github", getRowsInfo[0].A);
+            Assert.Equal("abcd", getRowsInfo[0].C);
+
+            Assert.Equal(@$"Microsoft {config.NewLine}Test 1", getRowsInfo[1].A);
+            Assert.Equal("efgh", getRowsInfo[1].C);
+
+            Assert.Equal(@$"Microsoft {config.NewLine}Test 2", getRowsInfo[2].A);
+            Assert.Equal($"ab{config.NewLine}c{config.NewLine}d", getRowsInfo[2].C);
+
+            Assert.Equal(@$"Microsoft"""" {config.NewLine}Test{config.NewLine}3", getRowsInfo[3].A);
+            Assert.Equal(@$"a""""{config.NewLine}b{config.NewLine}{config.NewLine}c", getRowsInfo[3].C);
+        }
+
+        [Fact]
+        public void Issue507_2() {
+            //Problem with multi-line when using Query func
+            //https://github.com/mini-software/MiniExcel/issues/507
+
+            var path = Path.Combine(Path.GetTempPath(), string.Concat(nameof(MiniExcelIssueTests), "_", nameof(Issue507_2), ".csv"));
+            var values = new Issue507V02[]
+            {
+                new() { B = DateTime.Parse("2021-01-01"), D = 123 },
+                new() { B = DateTime.Parse("2021-02-01"), D = 123 },
+                new() { B = DateTime.Parse("2021-02-01"), D = 123 },
+                new() { B = DateTime.Parse("2021-02-01"), D = 123 },
+            };
+
+            var config = new CsvConfiguration() {
+                //AlwaysQuote = true,
+                ReadLineBreaksWithinQuotes = true,
+            };
+
+            // create
+            using (var stream = File.Create(path)) {
+                stream.SaveAs(values, excelType: ExcelType.CSV, configuration: config);
+            }
+
+            // read
+            var getRowsInfo = MiniExcel.Query<Issue507V02>(path, excelType: ExcelType.CSV, configuration: config).ToArray();
+
+            Assert.Equal(values.Length, getRowsInfo.Count());
+
+        }
     }
 }
\ No newline at end of file