1 files changed, 82 insertions, 21 deletions
diff --git a/src/messageParser.hpp b/src/messageParser.hpp
index d3dc1478..f6853e9f 100644
--- a/src/messageParser.hpp
+++ b/src/messageParser.hpp
@@ -46,27 +46,88 @@ public:
 
 public:
 
-	// Expeditor and recipients
-	const mailbox& expeditor() const { return (m_from); }
-
-	const addressList& recipients() const { return (m_to); }
-	const addressList& copyRecipients() const { return (m_cc); }
-	const addressList& blindCopyRecipients() const { return (m_bcc); }
-
-	// Subject
-	const text& subject() const { return (m_subject); }
-
-	// Date
-	const datetime& date() const { return (m_date); }
-
-	// Attachments
-	const std::vector <attachment*>& attachments() const { return (m_attach); }
-	const contentDispositionField* attachmentInfo(attachment* a) const;
-
-	// Text parts
-	const std::vector <textPart*>& textParts() const { return (m_textParts); }
-
-protected:
+	/** Return the expeditor of the message (From:).
+	  *
+	  * @return expeditor of the message
+	  */
+	const mailbox& getExpeditor() const;
+
+	/** Return the recipients of the message (To:).
+	  *
+	  * return recipients of the message
+	  */
+	const addressList& getRecipients() const;
+
+	/** Return the copy recipients of the message (Cc:).
+	  *
+	  * @return copy recipients of the message
+	  */
+	const addressList& getCopyRecipients() const;
+
+	/** Return the blind-copy recipients of the message (Bcc:).
+	  *
+	  * @return blind-copy recipients of the message
+	  */
+	const addressList& getBlindCopyRecipients() const;
+
+	/** Return the subject of the message.
+	  *
+	  * @return subject of the message
+	  */
+	const text& getSubject() const;
+
+	/** Return the date of the message.
+	  *
+	  * @return date of the message
+	  */
+	const datetime& getDate() const;
+
+	/** Return the number of attachments in the message.
+	  *
+	  * @return number of attachments
+	  */
+	const int getAttachmentCount() const;
+
+	/** Return the attachment at the specified position.
+	  *
+	  * @param pos position of the attachment
+	  * @return attachment at position 'pos'
+	  */
+	const attachment* getAttachmentAt(const int pos) const;
+
+	/** Return the attachments of the message.
+	  *
+	  * @return list of attachments in the message
+	  */
+	const std::vector <const attachment*> getAttachmentList() const;
+
+	/** Return information about the specified attachment.
+	  *
+	  * @param a attachment to retrieve information about
+	  * @return information about the specified attachment
+	  */
+	const contentDispositionField* getAttachmentInfo(const attachment* a) const;
+
+	/** Return the text parts of the message.
+	  *
+	  * @return list of text parts in the message
+	  */
+	const std::vector <const textPart*> getTextPartList() const;
+
+	/** Return the number of text parts in the message.
+	  *
+	  * @return number of text parts
+	  */
+	const int getTextPartCount() const;
+
+	/** Return the text part at the specified position.
+	  *
+	  * @param pos position of the text part
+	  * @return text part at position 'pos'
+	  */
+	const textPart* getTextPartAt(const int pos) const;
+
+private:
 
 	mailbox m_from;