diff --git a/src/batch-client/index.ts b/src/batch-client/index.ts
index b9882107..4c741c50 100644
--- a/src/batch-client/index.ts
+++ b/src/batch-client/index.ts
@@ -301,13 +301,13 @@ export class ZimbraBatchClient {
 	public origin: string;
 	public sessionId: any;
 	public soapPathname: string;
+	private authToken?: string;
 	private batchDataLoader: DataLoader<RequestOptions, RequestBody>;
 	private csrfToken?: string;
 	private dataLoader: DataLoader<RequestOptions, RequestBody>;
 	private jwtToken?: string;
 	private sessionHandler?: SessionHandler;
 	private userAgent?: {};
-	private authToken?: string;
 
 	constructor(options: ZimbraClientOptions = {}) {
 		this.sessionHandler = options.sessionHandler;
@@ -335,7 +335,7 @@ export class ZimbraBatchClient {
 			cache: false
 		});
 
-		if(options.requestAPI){
+		if (options.requestAPI) {
 			setRequestAPI(options.requestAPI);
 		}
 	}
diff --git a/src/batch-client/types.ts b/src/batch-client/types.ts
index 961760f1..7b87a081 100644
--- a/src/batch-client/types.ts
+++ b/src/batch-client/types.ts
@@ -61,16 +61,16 @@ export type SessionHandler = {
 };
 
 export interface ZimbraClientOptions {
+	authToken?: string;
 	csrfToken?: string;
 	jwtToken?: string;
 	localStoreClient?: any;
 	notificationHandler?: NotificationHandler;
+	requestAPI?: any;
 	sessionHandler?: SessionHandler;
 	soapPathname?: string;
 	userAgent?: UserAgent;
 	zimbraOrigin?: string;
-	authToken?: string;
-	requestAPI?: any;
 }
 
 export interface FreeBusyOptions {
@@ -115,11 +115,11 @@ export interface GetFolderOptions {
 		path?: string;
 		uuid?: string;
 	};
+	local?: boolean;
 	needGranteeName?: boolean;
 	traverseMountpoints?: boolean;
 	view?: FolderView;
 	visible?: boolean;
-	local: boolean;
 }
 
 export interface GetDocumentShareURLItemOptions {
@@ -150,6 +150,7 @@ export interface GetMailItemOptions {
 	html?: boolean;
 	id: string;
 	ids: [String];
+	isLocal?: boolean;
 	max?: number;
 	needExp?: boolean;
 }
@@ -257,12 +258,12 @@ export interface ActionOptions {
 	folderId?: string;
 	id?: string;
 	ids?: Array<string>;
+	isLocal?: boolean;
 	name?: string;
 	op: string;
 	recursive?: Boolean;
 	rgb?: string;
 	tagNames?: string;
-	isLocal?: boolean;
 }
 
 export enum ActionType {
diff --git a/src/schema/generated-schema-types.ts b/src/schema/generated-schema-types.ts
index e326b114..85cce8c5 100644
--- a/src/schema/generated-schema-types.ts
+++ b/src/schema/generated-schema-types.ts
@@ -3302,6 +3302,7 @@ export type QueryClientInfoArgs = {
 export type QueryDownloadMessageArgs = {
   id: Scalars['ID'];
   isSecure?: Maybe<Scalars['Boolean']>;
+  isLocal?: Maybe<Scalars['Boolean']>;
 };
 
 
@@ -3426,6 +3427,7 @@ export type QueryGetMessageArgs = {
   id: Scalars['ID'];
   header?: Maybe<Array<Maybe<MailItemHeaderInput>>>;
   html?: Maybe<Scalars['Boolean']>;
+  isLocal?: Maybe<Scalars['Boolean']>;
   max?: Maybe<Scalars['Int']>;
   needExp?: Maybe<Scalars['Boolean']>;
   neuter?: Maybe<Scalars['Boolean']>;
diff --git a/src/schema/schema.graphql b/src/schema/schema.graphql
index 39daf20a..8d9c67ef 100644
--- a/src/schema/schema.graphql
+++ b/src/schema/schema.graphql
@@ -3093,7 +3093,7 @@ type Query {
 		needExp: Boolean
 	): AutoCompleteGALResponse
 	clientInfo(by: String, domain: String): ClientInfoType
-	downloadMessage(id: ID!, isSecure: Boolean): SMimeMessage
+	downloadMessage(id: ID!, isSecure: Boolean, isLocal: Boolean): SMimeMessage
 	downloadAttachment(id: ID!, part: ID!): Attachment
 	downloadDocument(id: ID!, url: String!): Attachment
 	discoverRights: DiscoverRights
@@ -3168,6 +3168,7 @@ type Query {
 		id: ID!
 		header: [MailItemHeaderInput]
 		html: Boolean
+		isLocal: Boolean
 		max: Int
 		needExp: Boolean
 		neuter: Boolean
@@ -3176,7 +3177,7 @@ type Query {
 		read: Boolean
 		ridZ: String
 	): MessageInfo
-	getMessagesMetadata(ids: [ID!]!): [MessageInfo]
+	getMessagesMetadata(ids: [ID!]!, isLocal: Boolean): [MessageInfo]
 	getRights(input: GetRightsInput!): RightsResponse
 	getSMimePublicCerts(
 		contactAddr: String!