diff --git a/MailKit/MailKit.csproj b/MailKit/MailKit.csproj
index 097b0b5bc0..017c040e5c 100644
--- a/MailKit/MailKit.csproj
+++ b/MailKit/MailKit.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An Open Source cross-platform .NET mail-client library that is based on MimeKit and optimized for mobile devices.</Description>
     <AssemblyTitle>MailKit</AssemblyTitle>
-    <VersionPrefix>4.7.1</VersionPrefix>
+    <VersionPrefix>4.8.0</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <LangVersion>10</LangVersion>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
diff --git a/MailKit/MailKitLite.csproj b/MailKit/MailKitLite.csproj
index 37dc31252c..0b6d547847 100644
--- a/MailKit/MailKitLite.csproj
+++ b/MailKit/MailKitLite.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An Open Source cross-platform .NET mail-client library that is based on MimeKit and optimized for mobile devices.</Description>
     <AssemblyTitle>MailKit</AssemblyTitle>
-    <VersionPrefix>4.7.1</VersionPrefix>
+    <VersionPrefix>4.8.0</VersionPrefix>
     <Authors>Jeffrey Stedfast</Authors>
     <LangVersion>10</LangVersion>
     <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
diff --git a/MailKit/Properties/AssemblyInfo.cs b/MailKit/Properties/AssemblyInfo.cs
index 24eb8206b9..6329190d94 100644
--- a/MailKit/Properties/AssemblyInfo.cs
+++ b/MailKit/Properties/AssemblyInfo.cs
@@ -79,6 +79,6 @@
 //
 // If there have only been bug fixes, bump the Micro Version and/or the Build Number
 //    in the AssemblyFileVersion attribute.
-[assembly: AssemblyInformationalVersion ("4.7.1.1")]
-[assembly: AssemblyFileVersion ("4.7.1.1")]
-[assembly: AssemblyVersion ("4.7.0.0")]
+[assembly: AssemblyInformationalVersion ("4.8.0.0")]
+[assembly: AssemblyFileVersion ("4.8.0.0")]
+[assembly: AssemblyVersion ("4.8.0.0")]
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 96f2dc5daa..7c09838211 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,5 +1,15 @@
 # Release Notes
 
+## MailKit 4.8.0 (2024-09-29)
+
+* Added a UniqueIdRange.SortOrder property.
+* Updated the protocol log help link for ProtocolExceptions.
+  (issue [#1800](https://github.com/jstedfast/MailKit/issues/1800))
+* Fix SmtpClient.Dispose() when telemetry is configured.
+  (issue [#1816](https://github.com/jstedfast/MailKit/issues/1816))
+* Added ProxyClient.SystemProxy as a convenience property that wraps
+  the default system proxy (aka HttpClient.DefaultProxy) on net6.0+.
+
 ## MailKit 4.7.1 (2024-07-12)
 
 * Fixed ImapClient and Pop3Client.Connect/Async() when OTEL is enabled.
diff --git a/nuget/MailKit.nuspec b/nuget/MailKit.nuspec
index cbc077dada..6a8722fe26 100644
--- a/nuget/MailKit.nuspec
+++ b/nuget/MailKit.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>MailKit</id>
-    <version>4.7.1</version>
+    <version>4.8.0</version>
     <title>MailKit</title>
     <authors>Jeffrey Stedfast</authors>
     <owners>Jeffrey Stedfast</owners>
@@ -26,8 +26,10 @@ Features include:
     </description>
     <summary>An Open Source .NET mail-client library for Windows, Mac, Linux, and mobile platforms such as iOS and Android.</summary>
     <releaseNotes>
-* Fixed ImapClient and Pop3Client.Connect/Async() when OTEL is enabled. (issue #1765)
-* Bumped MimeKit dependency to 4.7.1 to fix a denial of service security issue in the System.Formats.Asn1 dependency.
+* Added a UniqueIdRange.SortOrder property.
+* Updated the protocol log help link for ProtocolExceptions. (issue #1800)
+* Fix SmtpClient.Dispose() when telemetry is configured. (issue #1816)
+* Added ProxyClient.SystemProxy as a convenience property that wraps the default system proxy (aka HttpClient.DefaultProxy) on net6.0+.
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
@@ -55,34 +57,34 @@ Features include:
       <group targetFramework="net462">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="net47">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="net48">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="net8.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
       <group targetFramework="netstandard2.1">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKit" version="4.7.1" />
+        <dependency id="MimeKit" version="4.8.0" />
       </group>
     </dependencies>
   </metadata>
diff --git a/nuget/MailKitLite.nuspec b/nuget/MailKitLite.nuspec
index 5ea2929dcb..2f169a8eb1 100644
--- a/nuget/MailKitLite.nuspec
+++ b/nuget/MailKitLite.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>MailKitLite</id>
-    <version>4.7.1</version>
+    <version>4.8.0</version>
     <title>MailKit</title>
     <authors>Jeffrey Stedfast</authors>
     <owners>Jeffrey Stedfast</owners>
@@ -26,8 +26,10 @@ Features include:
     </description>
     <summary>An Open Source .NET mail-client library for Windows, Mac, Linux, and mobile platforms such as iOS and Android.</summary>
     <releaseNotes>
-* Fixed ImapClient and Pop3Client.Connect/Async() when OTEL is enabled. (issue #1765)
-* Bumped MimeKit dependency to 4.7.1 to fix a denial of service security issue in the System.Formats.Asn1 dependency.
+* Added a UniqueIdRange.SortOrder property.
+* Updated the protocol log help link for ProtocolExceptions. (issue #1800)
+* Fix SmtpClient.Dispose() when telemetry is configured. (issue #1816)
+* Added ProxyClient.SystemProxy as a convenience property that wraps the default system proxy (aka HttpClient.DefaultProxy) on net6.0+.
     </releaseNotes>
     <copyright>.NET Foundation and Contributors</copyright>
     <language>en-US</language>
@@ -51,34 +53,34 @@ Features include:
       <group targetFramework="net462">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="net47">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="net48">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="net6.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="net8.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="netstandard2.0">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
         <dependency id="System.Threading.Tasks.Extensions" version="4.5.4" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
       <group targetFramework="netstandard2.1">
         <dependency id="System.Formats.Asn1" version="8.0.1" />
-        <dependency id="MimeKitLite" version="4.7.1" />
+        <dependency id="MimeKitLite" version="4.8.0" />
       </group>
     </dependencies>
   </metadata>
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
index 9edf18aca2..a0f89e04ef 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
@@ -10,6 +10,6 @@
         <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="MailKit" Version="4.7.1.1"/>
+        <PackageReference Include="MailKit" Version="4.8.0" />
     </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
index a0eb7a0c6f..a7cc5ba270 100644
--- a/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
+++ b/samples/ImapClientDemo.iOS/ImapClientDemo.iOS/ImapClientDemo.iOS.csproj
@@ -7,7 +7,7 @@
         <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="MailKit" Version="4.7.1.1"/>
-        <PackageReference Include="Drastic.MonoTouch.Dialog" Version="1.0.0"/>
+        <PackageReference Include="MailKit" Version="4.8.0" />
+        <PackageReference Include="Drastic.MonoTouch.Dialog" Version="1.0.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj b/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj
index ebb852a2dc..7055f6a1e1 100644
--- a/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj
+++ b/samples/ImapClientDemo/ImapClientDemo/ImapClientDemo.csproj
@@ -48,7 +48,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.7.1.1" />
+    <PackageReference Include="MailKit" Version="4.8.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AuthenticationFailedEventArgs.cs" />
diff --git a/samples/ImapIdle/ImapIdle/ImapIdle.csproj b/samples/ImapIdle/ImapIdle/ImapIdle.csproj
index c439b4874b..3828e24630 100644
--- a/samples/ImapIdle/ImapIdle/ImapIdle.csproj
+++ b/samples/ImapIdle/ImapIdle/ImapIdle.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MailKit" Version="4.7.1.1" />
+    <PackageReference Include="MailKit" Version="4.8.0" />
   </ItemGroup>
 
 </Project>
diff --git a/submodules/MimeKit b/submodules/MimeKit
index 614ac09f14..e1913512d7 160000
--- a/submodules/MimeKit
+++ b/submodules/MimeKit
@@ -1 +1 @@
-Subproject commit 614ac09f14a7b27eb670d6f8c03fd6e8dafd3277
+Subproject commit e1913512d78aa1564895785007c9207921a443bb