diff --git a/kate/app/kateapp.cpp b/kate/app/kateapp.cpp
index 0e4c18121..479d0c77c 100644
--- a/kate/app/kateapp.cpp
+++ b/kate/app/kateapp.cpp
@@ -239,7 +239,7 @@ bool KateApp::startupKate()
     }
     else
       KMessageBox::sorry( activeMainWindow(),
-                          i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).url()) );
+                          i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(m_args->url(z).pathOrURL()) );
   }
 
   Kate::Document::setOpenErrorDialogsActivated (true);
@@ -350,9 +350,9 @@ bool KateApp::query_session_close()
       saveSessions = true;
     }
   }
-  
+
   if (saveSessions)
-  {    
+  {
     m_sessionManager->saveActiveSession();
   }
   m_sessionManager->saveConfig(saveSessions);
@@ -403,7 +403,7 @@ bool KateApp::openURL (const KURL &url, const TQString &encoding, bool isTempFil
   }
   else
     KMessageBox::sorry( mainWindow,
-                        i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.url()) );
+                        i18n("The file '%1' could not be opened: it is not a normal file, it is a folder.").arg(url.pathOrURL()) );
 
   return true;
 }
diff --git a/kate/app/katefilelist.cpp b/kate/app/katefilelist.cpp
index bb11cd6c7..1a1ce3103 100644
--- a/kate/app/katefilelist.cpp
+++ b/kate/app/katefilelist.cpp
@@ -438,7 +438,7 @@ TQString KateFileList::tooltip( TQListViewItem *item, int )
       str += i18n("<b>This file was changed (deleted) on disk by another program.</b><br />");
   }
 
-  str += i->document()->url().prettyURL();
+  str += i->document()->url().pathOrURL();
   return str;
 }
 
diff --git a/kate/app/katemainwindow.cpp b/kate/app/katemainwindow.cpp
index d432d49d4..00f01dfe6 100644
--- a/kate/app/katemainwindow.cpp
+++ b/kate/app/katemainwindow.cpp
@@ -851,7 +851,7 @@ void KateMainWindow::updateCaption(Kate::Document *doc)
   }
   else
   {
-    c = m_viewManager->activeView()->getDoc()->url().prettyURL();
+    c = m_viewManager->activeView()->getDoc()->url().pathOrURL();
   }
 
   if (showSessionName)
diff --git a/kate/app/katemwmodonhddialog.cpp b/kate/app/katemwmodonhddialog.cpp
index 3babd75e8..ffdd92fa7 100644
--- a/kate/app/katemwmodonhddialog.cpp
+++ b/kate/app/katemwmodonhddialog.cpp
@@ -44,7 +44,7 @@ class KateDocItem : public TQCheckListItem
 {
   public:
     KateDocItem( Kate::Document *doc, const TQString &status, TDEListView *lv )
-  : TQCheckListItem( lv, doc->url().prettyURL(), CheckBox ),
+  : TQCheckListItem( lv, doc->url().pathOrURL(), CheckBox ),
         document( doc )
     {
       setText( 1, status );
@@ -143,12 +143,12 @@ void KateMwModOnHdDialog::handleSelected( int action )
   for ( TQListViewItemIterator it ( lvDocuments );  it.current(); ++it )
   {
     KateDocItem *item = static_cast<KateDocItem *>(it.current());
-    
+
     if ( item->isOn() )
     {
       int reason = (int)KateDocManager::self()->documentInfo( item->document )->modifiedOnDiscReason;
       bool succes = true;
-      
+
       Kate::DocumentExt *dext = documentExt( item->document );
       if ( ! dext ) continue;
 
@@ -161,7 +161,7 @@ void KateMwModOnHdDialog::handleSelected( int action )
           {
             KMessageBox::sorry( this,
                                 i18n("Could not save the document \n'%1'").
-                                    arg( item->document->url().prettyURL() ) );
+                                    arg( item->document->url().pathOrURL() ) );
           }
           break;
 
diff --git a/kate/app/kateviewspacecontainer.cpp b/kate/app/kateviewspacecontainer.cpp
index 50e0d7ea2..72ffc8644 100644
--- a/kate/app/kateviewspacecontainer.cpp
+++ b/kate/app/kateviewspacecontainer.cpp
@@ -429,7 +429,7 @@ void KateViewSpaceContainer::statusMsg ()
   }
   else
   {
-    c = v->getDoc()->url().prettyURL();
+    c = v->getDoc()->url().pathOrURL();
   }
 
   m_viewManager->mainWindow()->tabWidget()->changeTab (this, KStringHandler::lsqueeze(c,32));