2 files changed, 2 insertions, 16 deletions
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 9f8ee75c6..efc3a93bb 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -323,7 +323,7 @@ class NetworkContentListWindow : public Window, ContentCallback {
 	/** Sort content by name. */
 	static int CDECL NameSorter(const ContentInfo * const *a, const ContentInfo * const *b)
 	{
-		return strnatcmp((*a)->name, (*b)->name); // Sort by name (natural sorting).
+		return strnatcmp((*a)->name, (*b)->name, true); // Sort by name (natural sorting).
 	}
 
 	/** Sort content by type. */
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index c0a73d808..91eacfcee 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -263,24 +263,10 @@ protected:
 		this->UpdateListPos();
 	}
 
-	/**
-	 * Skip some of the 'garbage' in the string that we don't want to use
-	 * to sort on. This way the alphabetical sorting will work better as
-	 * we would be actually using those characters instead of some other
-	 * characters such as spaces and tildes at the begin of the name.
-	 * @param str The string to skip the initial garbage of.
-	 * @return The string with the garbage skipped.
-	 */
-	static const char *SkipGarbage(const char *str)
-	{
-		while (*str != '\0' && (*str < 'A' || IsInsideMM(*str, '[', '`' + 1) || IsInsideMM(*str, '{', '~' + 1))) str++;
-		return str;
-	}
-
 	/** Sort servers by name. */
 	static int CDECL NGameNameSorter(NetworkGameList * const *a, NetworkGameList * const *b)
 	{
-		int r = strnatcmp(SkipGarbage((*a)->info.server_name), SkipGarbage((*b)->info.server_name)); // Sort by name (natural sorting).
+		int r = strnatcmp((*a)->info.server_name, (*b)->info.server_name, true); // Sort by name (natural sorting).
 		return r == 0 ? (*a)->address.CompareTo((*b)->address) : r;
 	}