5 files changed, 9 insertions, 9 deletions
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index 779f1535..4ad581d0 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -1323,7 +1323,7 @@ void IMAPFolder::addMessage(ref <vmime::message> msg, const int flags,
 
 	msg->generate(ossAdapter);
 
-	const std::string& str = oss.str();
+	const string& str = oss.str();
 	utility::inputStreamStringAdapter strAdapter(str);
 
 	addMessage(strAdapter, str.length(), flags, date, progress);
diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp
index d215f180..4fea517f 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/net/imap/IMAPUtils.cpp
@@ -634,7 +634,7 @@ const string IMAPUtils::dateTime(const vmime::datetime& date)
 
 // static
 const string IMAPUtils::buildFetchRequestImpl
-	(const std::string& mode, const std::string& set, const int options)
+	(const string& mode, const string& set, const int options)
 {
 	// Example:
 	//   C: A654 FETCH 2:4 (FLAGS BODY[HEADER.FIELDS (DATE FROM)])
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index 841d5f5d..aa886ff3 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -834,7 +834,7 @@ void maildirFolder::addMessage(ref <vmime::message> msg, const int flags,
 
 	msg->generate(ossAdapter);
 
-	const std::string& str = oss.str();
+	const string& str = oss.str();
 	utility::inputStreamStringAdapter strAdapter(str);
 
 	addMessage(strAdapter, str.length(), flags, date, progress);
diff --git a/src/net/pop3/POP3Command.cpp b/src/net/pop3/POP3Command.cpp
index 72909a49..01589656 100644
--- a/src/net/pop3/POP3Command.cpp
+++ b/src/net/pop3/POP3Command.cpp
@@ -203,7 +203,7 @@ ref <POP3Command> POP3Command::QUIT()
 
 
 // static
-ref <POP3Command> POP3Command::createCommand(const std::string& text)
+ref <POP3Command> POP3Command::createCommand(const string& text)
 {
 	return vmime::create <POP3Command>(text);
 }
diff --git a/src/net/smtp/SMTPCommand.cpp b/src/net/smtp/SMTPCommand.cpp
index 99a3ac17..35ea56fb 100644
--- a/src/net/smtp/SMTPCommand.cpp
+++ b/src/net/smtp/SMTPCommand.cpp
@@ -40,14 +40,14 @@ namespace net {
 namespace smtp {
 
 
-SMTPCommand::SMTPCommand(const std::string& text)
+SMTPCommand::SMTPCommand(const string& text)
 	: m_text(text)
 {
 }
 
 
 // static
-ref <SMTPCommand> SMTPCommand::EHLO(const std::string& hostname)
+ref <SMTPCommand> SMTPCommand::EHLO(const string& hostname)
 {
 	std::ostringstream cmd;
 	cmd.imbue(std::locale::classic());
@@ -58,7 +58,7 @@ ref <SMTPCommand> SMTPCommand::EHLO(const std::string& hostname)
 
 
 // static
-ref <SMTPCommand> SMTPCommand::HELO(const std::string& hostname)
+ref <SMTPCommand> SMTPCommand::HELO(const string& hostname)
 {
 	std::ostringstream cmd;
 	cmd.imbue(std::locale::classic());
@@ -69,7 +69,7 @@ ref <SMTPCommand> SMTPCommand::HELO(const std::string& hostname)
 
 
 // static
-ref <SMTPCommand> SMTPCommand::AUTH(const std::string& mechName)
+ref <SMTPCommand> SMTPCommand::AUTH(const string& mechName)
 {
 	std::ostringstream cmd;
 	cmd.imbue(std::locale::classic());
@@ -147,7 +147,7 @@ ref <SMTPCommand> SMTPCommand::QUIT()
 
 
 // static
-ref <SMTPCommand> SMTPCommand::createCommand(const std::string& text)
+ref <SMTPCommand> SMTPCommand::createCommand(const string& text)
 {
 	return vmime::create <SMTPCommand>(text);
 }