diff --git a/src/addressList.cpp b/src/addressList.cpp
index 33708ceb..85178961 100644
--- a/src/addressList.cpp
+++ b/src/addressList.cpp
@@ -220,7 +220,7 @@ address* addressList::getAddressAt(const int pos)
 }
 
 
-const address* const addressList::getAddressAt(const int pos) const
+const address* addressList::getAddressAt(const int pos) const
 {
 	return (m_list[pos]);
 }
diff --git a/src/body.cpp b/src/body.cpp
index becb49cc..85e1f4f7 100644
--- a/src/body.cpp
+++ b/src/body.cpp
@@ -678,7 +678,7 @@ bodyPart* body::getPartAt(const int pos)
 }
 
 
-const bodyPart* const body::getPartAt(const int pos) const
+const bodyPart* body::getPartAt(const int pos) const
 {
 	return (m_parts[pos]);
 }
diff --git a/src/header.cpp b/src/header.cpp
index 8209b21b..ddbf183e 100644
--- a/src/header.cpp
+++ b/src/header.cpp
@@ -482,7 +482,7 @@ headerField* header::getFieldAt(const int pos)
 }
 
 
-const headerField* const header::getFieldAt(const int pos) const
+const headerField* header::getFieldAt(const int pos) const
 {
 	return (m_fields[pos]);
 }
diff --git a/src/mailboxGroup.cpp b/src/mailboxGroup.cpp
index 71c5ecf0..b8b5fdec 100644
--- a/src/mailboxGroup.cpp
+++ b/src/mailboxGroup.cpp
@@ -322,7 +322,7 @@ mailbox* mailboxGroup::getMailboxAt(const int pos)
 }
 
 
-const mailbox* const mailboxGroup::getMailboxAt(const int pos) const
+const mailbox* mailboxGroup::getMailboxAt(const int pos) const
 {
 	return (m_list[pos]);
 }
diff --git a/src/mailboxList.cpp b/src/mailboxList.cpp
index b05d6097..55f7532a 100644
--- a/src/mailboxList.cpp
+++ b/src/mailboxList.cpp
@@ -123,7 +123,7 @@ mailbox* mailboxList::getMailboxAt(const int pos)
 }
 
 
-const mailbox* const mailboxList::getMailboxAt(const int pos) const
+const mailbox* mailboxList::getMailboxAt(const int pos) const
 {
 	return static_cast <const mailbox*>(addressList::getAddressAt(pos));
 }
diff --git a/src/parameterizedHeaderField.cpp b/src/parameterizedHeaderField.cpp
index 9494103c..348eca21 100644
--- a/src/parameterizedHeaderField.cpp
+++ b/src/parameterizedHeaderField.cpp
@@ -406,7 +406,7 @@ parameter* parameterizedHeaderField::getParameterAt(const int pos)
 }
 
 
-const parameter* const parameterizedHeaderField::getParameterAt(const int pos) const
+const parameter* parameterizedHeaderField::getParameterAt(const int pos) const
 {
 	return (m_params[pos]);
 }
diff --git a/src/text.cpp b/src/text.cpp
index 4b520a43..5995daf1 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -214,7 +214,7 @@ word* text::getWordAt(const int pos)
 }
 
 
-const word* const text::getWordAt(const int pos) const
+const word* text::getWordAt(const int pos) const
 {
 	return (m_words[pos]);
 }
diff --git a/vmime/addressList.hpp b/vmime/addressList.hpp
index 07c72ff9..57558218 100644
--- a/vmime/addressList.hpp
+++ b/vmime/addressList.hpp
@@ -133,7 +133,7 @@ public:
 	  * @param pos position
 	  * @return address at position 'pos'
 	  */
-	const address* const getAddressAt(const int pos) const;
+	const address* getAddressAt(const int pos) const;
 
 	/** Return the address list.
 	  *
diff --git a/vmime/body.hpp b/vmime/body.hpp
index 2bca0a6c..cd2f8074 100644
--- a/vmime/body.hpp
+++ b/vmime/body.hpp
@@ -134,7 +134,7 @@ public:
 	  * @param pos position
 	  * @return part at position 'pos'
 	  */
-	const bodyPart* const getPartAt(const int pos) const;
+	const bodyPart* getPartAt(const int pos) const;
 
 	/** Return the part list.
 	  *
diff --git a/vmime/header.hpp b/vmime/header.hpp
index 70b657be..1895e79e 100644
--- a/vmime/header.hpp
+++ b/vmime/header.hpp
@@ -196,7 +196,7 @@ public:
 	  * @param pos position
 	  * @return field at position 'pos'
 	  */
-	const headerField* const getFieldAt(const int pos) const;
+	const headerField* getFieldAt(const int pos) const;
 
 	/** Return the field list.
 	  *
diff --git a/vmime/mailboxGroup.hpp b/vmime/mailboxGroup.hpp
index 622f9140..daf4ee91 100644
--- a/vmime/mailboxGroup.hpp
+++ b/vmime/mailboxGroup.hpp
@@ -140,7 +140,7 @@ public:
 	  * @param pos position
 	  * @return mailbox at position 'pos'
 	  */
-	const mailbox* const getMailboxAt(const int pos) const;
+	const mailbox* getMailboxAt(const int pos) const;
 
 	/** Return the mailbox list.
 	  *
diff --git a/vmime/mailboxList.hpp b/vmime/mailboxList.hpp
index 3d17f7a5..8936e4ad 100644
--- a/vmime/mailboxList.hpp
+++ b/vmime/mailboxList.hpp
@@ -32,12 +32,8 @@ namespace vmime
 /** A list of mailboxes (basic type).
   */
 
-#ifdef __GNUC__
-#	if (__GNUC__ >= 3) && (__GNUC_MINOR__ <= 2)
+#if (defined(__GNUC__) && (__GNUC__ >= 3) && (__GNUC_MINOR__ <= 2))
 class mailboxList : public addressList  // BUG with gcc <= 3.2
-#	else
-class mailboxList : protected addressList
-#	endif
 #else
 class mailboxList : protected addressList
 #endif
@@ -130,7 +126,7 @@ public:
 	  * @param pos position
 	  * @return mailbox at position 'pos'
 	  */
-	const mailbox* const getMailboxAt(const int pos) const;
+	const mailbox* getMailboxAt(const int pos) const;
 
 	/** Return the mailbox list.
 	  *
diff --git a/vmime/parameterizedHeaderField.hpp b/vmime/parameterizedHeaderField.hpp
index e1ef2831..a4180cd3 100644
--- a/vmime/parameterizedHeaderField.hpp
+++ b/vmime/parameterizedHeaderField.hpp
@@ -147,7 +147,7 @@ public:
 	  * @param pos position
 	  * @return parameter at position 'pos'
 	  */
-	const parameter* const getParameterAt(const int pos) const;
+	const parameter* getParameterAt(const int pos) const;
 
 	/** Return the parameter list.
 	  *
diff --git a/vmime/platformDependant.hpp b/vmime/platformDependant.hpp
index c46c0d5f..a4fead32 100644
--- a/vmime/platformDependant.hpp
+++ b/vmime/platformDependant.hpp
@@ -138,7 +138,7 @@ public:
 		sm_handler = new TYPE;
 	}
 
-	static const handler* const getHandler()
+	static const handler* getHandler()
 	{
 		if (!sm_handler)
 			throw exceptions::no_platform_dependant_handler();
diff --git a/vmime/text.hpp b/vmime/text.hpp
index 7b94e3d8..a7a6a793 100644
--- a/vmime/text.hpp
+++ b/vmime/text.hpp
@@ -110,7 +110,7 @@ public:
 	  * @param pos position
 	  * @return word at position 'pos'
 	  */
-	const word* const getWordAt(const int pos) const;
+	const word* getWordAt(const int pos) const;
 
 	/** Return the word list.
 	  *