diff --git a/Client.cpp b/Client.cpp
index 305d543c..9ec2ab2d 100644
--- a/Client.cpp
+++ b/Client.cpp
@@ -1079,7 +1079,7 @@ void CClient::UserCommand(const CString& sLine) {
 					Table.AddRow();
 					Table.SetCell("Type", "Sending");
 					Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
-					Table.SetCell("Speed", CString::ToKBytes(pSock->GetAvgWrite() / 1000.0));
+					Table.SetCell("Speed", CString((int)(pSock->GetAvgWrite() / 1024.0)) + " KiB/s");
 					Table.SetCell("Nick", pSock->GetRemoteNick());
 					Table.SetCell("IP", pSock->GetRemoteIP());
 					Table.SetCell("File", pSock->GetFileName());
@@ -1089,7 +1089,7 @@ void CClient::UserCommand(const CString& sLine) {
 					Table.AddRow();
 					Table.SetCell("Type", "Getting");
 					Table.SetCell("State", CString::ToPercent(pSock->GetProgress()));
-					Table.SetCell("Speed", CString::ToKBytes(pSock->GetAvgRead() / 1000.0));
+					Table.SetCell("Speed", CString((int)(pSock->GetAvgRead() / 1024.0)) + " KiB/s");
 					Table.SetCell("Nick", pSock->GetRemoteNick());
 					Table.SetCell("IP", pSock->GetRemoteIP());
 					Table.SetCell("File", pSock->GetFileName());
diff --git a/DCCSock.cpp b/DCCSock.cpp
index a71f2746..b008a036 100644
--- a/DCCSock.cpp
+++ b/DCCSock.cpp
@@ -77,9 +77,11 @@ void CDCCSock::Disconnected() {
 		m_pUser->PutModule(m_sModuleName, sStart + "TooMuchData!");
 	} else if (m_uBytesSoFar == m_uFileSize) {
 		if (m_bSend) {
-			m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Sent [" + m_sLocalFile + "] at [" + CString::ToKBytes(GetAvgWrite() / 1000.0) + "]");
+			m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Sent [" + m_sLocalFile +
+					"] at [" + CString((int) (GetAvgWrite() / 1024.0)) + " KiB/s ]");
 		} else {
-			m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Saved to [" + m_sLocalFile + "] at [" + CString::ToKBytes(GetAvgRead() / 1000.0) + "]");
+			m_pUser->PutModule(m_sModuleName, sStart + "Completed! - Saved to [" + m_sLocalFile +
+					"] at [" + CString((int) (GetAvgRead() / 1024.0)) + " KiB/s ]");
 		}
 	} else {
 		m_pUser->PutModule(m_sModuleName, sStart + "Incomplete!");
diff --git a/String.cpp b/String.cpp
index 72b61898..38ec9b12 100644
--- a/String.cpp
+++ b/String.cpp
@@ -846,12 +846,6 @@ CString CString::ToPercent(double d) {
 	return szRet;
 }
 
-CString CString::ToKBytes(double d) {
-	char szRet[32];
-	snprintf(szRet, 32, "%.0f K/s", d);
-	return szRet;
-}
-
 CString CString::ToByteStr(unsigned long long d) {
 	const unsigned long long KiB = 1024;
 	const unsigned long long MiB = KiB * 1024;
diff --git a/String.h b/String.h
index 3d575c28..ec957df8 100644
--- a/String.h
+++ b/String.h
@@ -128,7 +128,6 @@ public:
 #endif
 
 	static CString ToPercent(double d);
-	static CString ToKBytes(double d);
 	static CString ToByteStr(unsigned long long d);
 
 	bool ToBool() const;