diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
index c7a481fb2..f526993d3 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/i18n/mail.properties
@@ -1,21 +1,61 @@
+# binding
+
+binding.mail.name = Mail Binding
+binding.mail.description = This binding is used to access POP3, IMAP and SMTP servers.
+
+# thing types
+
+thing-type.mail.imap.label = IMAP Server
+thing-type.mail.imap.description = Used for receiving emails
+thing-type.mail.pop3.label = POP3 Server
+thing-type.mail.pop3.description = Used for receiving emails
+thing-type.mail.smtp.label = SMTP Server
+thing-type.mail.smtp.description = Used for sending emails via rule actions
+
+# thing types config
+
+thing-type.config.mail.imap.port.description = Default values are 143 for plain/STARTTLS and 993 for SSL/TLS
+thing-type.config.mail.pop3.port.description = Default values are 110 for plain/STARTTLS and 995 for SSL/TLS
+thing-type.config.mail.smtp.port.description = Default values are 25 for plain/STARTTLS and 465 for SSL/TLS
+thing-type.config.mail.smtp.sender.label = Sender
+thing-type.config.mail.smtp.sender.description = Default sender address for mail
+
+config.hostname.label = Server Hostname
+config.password.label = SMTP Server Password
+config.port.label = Server Port
+config.refresh.label = Refresh Time
+config.refresh.description = Refresh time for this account in seconds
+config.security.label = SMTP Server Security Protocol
+config.security.option.PLAIN = plain
+config.security.option.STARTTLS = STARTTLS
+config.security.option.SSL = SSL/TLS
+config.username.label = SMTP Server Username
+
+# channel types
+
+channel-type.mail.mailcount.label = Mail Count
+channel-type.mail.mailcount.description = Number of emails in folder
+
+# channel types config
+
+channel-type.config.mail.mailcount.folder.label = Folder Name
+channel-type.config.mail.mailcount.type.label = Counter Type
+channel-type.config.mail.mailcount.type.option.UNREAD = Unread
+channel-type.config.mail.mailcount.type.option.TOTAL = Total
+
 # actions
-sendMessageActionLabel = send a text mail
-sendMessageActionDescription = Sends a text mail.
-
-sendAttachmentMessageActionLabel = send a text mail with attachment
-sendAttachmentMessageActionDescription = Sends a text mail with an URL attachment.
-
-sendAttachmentsMessageActionLabel = send a text mail with several attachments
-sendAttachmentsMessageActionDescription = Sends a text mail with several URL attachments.
-
-sendHTMLMessageActionLabel = send a HTML mail
-sendHTMLMessageActionDescription = Sends a HTML mail.
-
-sendHTMLAttachmentMessageActionLabel = send a HTML mail with attachment
-sendHTMLAttachmentMessageActionDescription = Sends a HTML mail with an URL attachment.
-
-sendHTMLAttachmentsMessageActionLabel = send a HTML mail with several attachments
-sendHTMLAttachmentsMessageActionDescription = Sends a HTML mail with several URL attachments.
 
 addHeaderActionLabel = add a mail header
 addHeaderActionDescription = Adds a mail header to the mail message.
+sendAttachmentMessageActionLabel = send a text mail with attachment
+sendAttachmentMessageActionDescription = Sends a text mail with an URL attachment.
+sendAttachmentsMessageActionLabel = send a text mail with several attachments
+sendAttachmentsMessageActionDescription = Sends a text mail with several URL attachments.
+sendHTMLAttachmentMessageActionLabel = send a HTML mail with attachment
+sendHTMLAttachmentMessageActionDescription = Sends a HTML mail with an URL attachment.
+sendHTMLAttachmentsMessageActionLabel = send a HTML mail with several attachments
+sendHTMLAttachmentsMessageActionDescription = Sends a HTML mail with several URL attachments.
+sendHTMLMessageActionLabel = send a HTML mail
+sendHTMLMessageActionDescription = Sends a HTML mail.
+sendMessageActionLabel = send a text mail
+sendMessageActionDescription = Sends a text mail.
diff --git a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/thing/thing-types.xml b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/thing/thing-types.xml
index a7eaebf65..5483caecb 100644
--- a/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/thing/thing-types.xml
+++ b/bundles/org.openhab.binding.mail/src/main/resources/OH-INF/thing/thing-types.xml
@@ -13,28 +13,28 @@
 				<description>Default sender address for mail</description>
 			</parameter>
 			<parameter name="hostname" type="text" required="true">
-				<label>Server Hostname</label>
+				<label>@text/config.hostname.label</label>
 			</parameter>
 			<parameter name="port" type="text" required="false">
-				<label>Server Port</label>
+				<label>@text/config.port.label</label>
 				<description>Default values are 25 for plain/STARTTLS and 465 for SSL/TLS</description>
 				<advanced>true</advanced>
 			</parameter>
 			<parameter name="security" type="text" required="false">
-				<label>SMTP Server Security Protocol</label>
+				<label>@text/config.security.label</label>
 				<options>
-					<option value="PLAIN">plain</option>
-					<option value="STARTTLS">STARTTLS</option>
-					<option value="SSL">SSL/TLS</option>
+					<option value="PLAIN">@text/config.security.option.PLAIN</option>
+					<option value="STARTTLS">@text/config.security.option.STARTTLS</option>
+					<option value="SSL">@text/config.security.option.SSL</option>
 				</options>
 				<limitToOptions>true</limitToOptions>
 				<default>PLAIN</default>
 			</parameter>
 			<parameter name="username" type="text" required="false">
-				<label>SMTP Server Username</label>
+				<label>@text/config.username.label</label>
 			</parameter>
 			<parameter name="password" type="text" required="false">
-				<label>SMTP Server Password</label>
+				<label>@text/config.password.label</label>
 				<context>password</context>
 			</parameter>
 		</config-description>
@@ -44,32 +44,33 @@
 		<description>Used for receiving emails</description>
 		<config-description>
 			<parameter name="hostname" type="text" required="true">
-				<label>Server Hostname</label>
+				<label>@text/config.hostname.label</label>
 			</parameter>
 			<parameter name="port" type="text" required="false">
-				<label>Server Port</label>
+				<label>@text/config.port.label</label>
 				<description>Default values are 143 for plain/STARTTLS and 993 for SSL/TLS</description>
 				<advanced>true</advanced>
 			</parameter>
 			<parameter name="security" type="text" required="false">
-				<label>SMTP Server Security Protocol</label>
+				<label>@text/config.security.label</label>
 				<options>
-					<option value="PLAIN">plain</option>
-					<option value="STARTTLS">STARTTLS</option>
-					<option value="SSL">SSL/TLS</option>
+					<option value="PLAIN">@text/config.security.option.PLAIN</option>
+					<option value="STARTTLS">@text/config.security.option.STARTTLS</option>
+					<option value="SSL">@text/config.security.option.SSL</option>
 				</options>
 				<limitToOptions>true</limitToOptions>
 				<default>PLAIN</default>
 			</parameter>
 			<parameter name="username" type="text" required="true">
-				<label>SMTP Server Username</label>
+				<label>@text/config.username.label</label>
 			</parameter>
 			<parameter name="password" type="text" required="true">
-				<label>SMTP Server Password</label>
+				<label>@text/config.password.label</label>
 				<context>password</context>
 			</parameter>
 			<parameter name="refresh" type="integer" required="false">
-				<label>Refresh Time for This Account in S</label>
+				<label>@text/config.refresh.label</label>
+				<description>@text/config.refresh.description</description>
 				<default>60</default>
 			</parameter>
 		</config-description>
@@ -79,32 +80,33 @@
 		<description>Used for receiving emails</description>
 		<config-description>
 			<parameter name="hostname" type="text" required="true">
-				<label>Server Hostname</label>
+				<label>@text/config.hostname.label</label>
 			</parameter>
 			<parameter name="port" type="text" required="false">
-				<label>Server Port</label>
+				<label>@text/config.port.label</label>
 				<description>Default values are 110 for plain/STARTTLS and 995 for SSL/TLS</description>
 				<advanced>true</advanced>
 			</parameter>
 			<parameter name="security" type="text" required="false">
-				<label>SMTP Server Security Protocol</label>
+				<label>@text/config.security.label</label>
 				<options>
-					<option value="PLAIN">plain</option>
-					<option value="STARTTLS">STARTTLS</option>
-					<option value="SSL">SSL/TLS</option>
+					<option value="PLAIN">@text/config.security.option.PLAIN</option>
+					<option value="STARTTLS">@text/config.security.option.STARTTLS</option>
+					<option value="SSL">@text/config.security.option.SSL</option>
 				</options>
 				<limitToOptions>true</limitToOptions>
 				<default>PLAIN</default>
 			</parameter>
 			<parameter name="username" type="text" required="true">
-				<label>SMTP Server Username</label>
+				<label>@text/config.username.label</label>
 			</parameter>
 			<parameter name="password" type="text" required="true">
-				<label>SMTP Server Password</label>
+				<label>@text/config.password.label</label>
 				<context>password</context>
 			</parameter>
 			<parameter name="refresh" type="integer" required="false">
-				<label>Refresh Time for This Account in S</label>
+				<label>@text/config.refresh.label</label>
+				<description>@text/config.refresh.description</description>
 				<default>60</default>
 			</parameter>
 		</config-description>
@@ -120,6 +122,7 @@
 				<label>Folder Name</label>
 			</parameter>
 			<parameter name="type" type="text" required="false">
+				<label>Counter Type</label>
 				<options>
 					<option value="UNREAD">Unread</option>
 					<option value="TOTAL">Total</option>