diff --git a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
index c33d8c1ca..6be423099 100644
--- a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
+++ b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
@@ -176,7 +176,7 @@ private void byteArrayDataSource(final InputStream aIs)
     }
 
     /**
-     * Get the content type.
+     * Gets the content type.
      *
      * @return A String.
      * @since 1.0
@@ -188,7 +188,7 @@ public String getContentType()
     }
 
     /**
-     * Get the input stream.
+     * Gets the input stream.
      *
      * @return An InputStream.
      * @throws IOException IOException
@@ -216,7 +216,7 @@ public void setName(final String name)
     }
 
     /**
-     * Get the name.
+     * Gets the name.
      *
      * @return A String.
      * @since 1.0
@@ -228,7 +228,7 @@ public String getName()
     }
 
     /**
-     * Get the OutputStream to write to.
+     * Gets the OutputStream to write to.
      *
      * @return  An OutputStream
      * @since 1.0
diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail/Email.java
index 9753d821b..75f27cecd 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -1803,7 +1803,7 @@ public Email setSendPartial(final boolean sendPartial)
     }
 
     /**
-     * Get the list of "To" addresses.
+     * Gets the list of "To" addresses.
      *
      * @return List addresses
      */
@@ -1813,7 +1813,7 @@ public List<InternetAddress> getToAddresses()
     }
 
     /**
-     * Get the list of "CC" addresses.
+     * Gets the list of "CC" addresses.
      *
      * @return List addresses
      */
@@ -1823,7 +1823,7 @@ public List<InternetAddress> getCcAddresses()
     }
 
     /**
-     * Get the list of "Bcc" addresses.
+     * Gets the list of "Bcc" addresses.
      *
      * @return List addresses
      */
@@ -1833,7 +1833,7 @@ public List<InternetAddress> getBccAddresses()
     }
 
     /**
-     * Get the list of "Reply-To" addresses.
+     * Gets the list of "Reply-To" addresses.
      *
      * @return List addresses
      */
@@ -1843,7 +1843,7 @@ public List<InternetAddress> getReplyToAddresses()
     }
 
     /**
-     * Get the socket connection timeout value in milliseconds.
+     * Gets the socket connection timeout value in milliseconds.
      *
      * @return the timeout in milliseconds.
      * @since 1.2
@@ -1868,7 +1868,7 @@ public void setSocketConnectionTimeout(final int socketConnectionTimeout)
     }
 
     /**
-     * Get the socket I/O timeout value in milliseconds.
+     * Gets the socket I/O timeout value in milliseconds.
      *
      * @return the socket I/O timeout
      * @since 1.2
diff --git a/src/main/java/org/apache/commons/mail/EmailAttachment.java b/src/main/java/org/apache/commons/mail/EmailAttachment.java
index cbe5733de..6d67c3506 100644
--- a/src/main/java/org/apache/commons/mail/EmailAttachment.java
+++ b/src/main/java/org/apache/commons/mail/EmailAttachment.java
@@ -47,7 +47,7 @@ public class EmailAttachment
     private String disposition = EmailAttachment.ATTACHMENT;
 
     /**
-     * Get the description.
+     * Gets the description.
      *
      * @return A String.
      * @since 1.0
@@ -58,7 +58,7 @@ public String getDescription()
     }
 
     /**
-     * Get the name.
+     * Gets the name.
      *
      * @return A String.
      * @since 1.0
@@ -69,7 +69,7 @@ public String getName()
     }
 
     /**
-     * Get the path.
+     * Gets the path.
      *
      * @return A String.
      * @since 1.0
@@ -80,7 +80,7 @@ public String getPath()
     }
 
     /**
-     * Get the URL.
+     * Gets the URL.
      *
      * @return A URL.
      * @since 1.0
@@ -91,7 +91,7 @@ public URL getURL()
     }
 
     /**
-     * Get the disposition.
+     * Gets the disposition.
      *
      * @return A String.
      * @since 1.0
diff --git a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
index df36462a7..5603cc5cb 100644
--- a/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
@@ -70,7 +70,7 @@ public class ImageHtmlEmail extends HtmlEmail
     private DataSourceResolver dataSourceResolver;
 
     /**
-     * Get the data source resolver.
+     * Gets the data source resolver.
      *
      * @return the resolver
      */
diff --git a/src/main/java/org/apache/commons/mail/MultiPartEmail.java b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
index 9a22e99f0..7b304489f 100644
--- a/src/main/java/org/apache/commons/mail/MultiPartEmail.java
+++ b/src/main/java/org/apache/commons/mail/MultiPartEmail.java
@@ -74,7 +74,7 @@ public void setSubType(final String aSubType)
     }
 
     /**
-     * Get the MIME subtype of the email.
+     * Gets the MIME subtype of the email.
      *
      * @return MIME subtype of the email
      * @since 1.0
diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java b/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
index ae6882a2a..a05698154 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceCompositeResolver.java
@@ -55,7 +55,7 @@ public DataSourceCompositeResolver(final DataSourceResolver[] dataSourceResolver
     }
 
     /**
-     * Get the underlying data source resolvers.
+     * Gets the underlying data source resolvers.
      *
      * @return underlying data source resolvers
      */
diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java b/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
index 0aeafc86a..576966ac9 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
@@ -63,7 +63,7 @@ public DataSourceFileResolver(final File baseDir, final boolean lenient)
     }
 
     /**
-     * Get the base directory used for resolving relative resource locations.
+     * Gets the base directory used for resolving relative resource locations.
      *
      * @return the baseUrl
      */
diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
index c832fc8b1..3fd0ba786 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
@@ -55,7 +55,7 @@ public DataSourceUrlResolver(final URL baseUrl, final boolean lenient)
     }
 
     /**
-     * Get the base URL used for resolving relative resource locations.
+     * Gets the base URL used for resolving relative resource locations.
      *
      * @return the baseUrl
      */