diff --git a/kdecore/io/kurl.cpp b/kdecore/io/kurl.cpp
index bf07cbd3..d46c926d 100644
--- a/kdecore/io/kurl.cpp
+++ b/kdecore/io/kurl.cpp
@@ -627,17 +627,14 @@ QString KUrl::pathOrUrl(AdjustPathOption trailing) const
     if (isLocalFile() && !hasFragment() && !hasQuery()) {
         return toLocalFile(trailing);
     }
-    return prettyUrl(trailing);
+    return url(trailing);
 }
 
 // used for text/uri-list in the mime data. don't fold this into populateMimeData, it's also needed
 // by other code like konqdrag
 QString KUrl::toMimeDataString() const
 {
-    if (isLocalFile()) {
-        return url();
-    }
-    if (hasPass()) {
+    if (hasPass() && !isLocalFile()) {
         KUrl safeUrl(*this);
         safeUrl.setPassword(QString());
         return safeUrl.url();